Merge pull request #54 from nmattia/nm-rust-analyzer

Add support for wildcard members and int fields in manifests

builtins/to-toml.nix

@@ -42,7 +42,7 @@ let
     let
       ty = tomlTy v;
     in
-      if ty == "bool" then
+      if (ty == "bool" || ty == "int") then
         builtins.toJSON v
       else
         if ty == "string" then

config.nix

@@ -176,10 +176,29 @@ let
                         value = readTOML (root + "/${member}/Cargo.toml");
                       }
                   )
-                  (toplevelCargotoml.workspace.members or [])
+                  members
               )
           );
 
+    # The cargo members
+    members =
+      let
+        # the members, as listed in the virtual manifest
+        listedMembers = toplevelCargotoml.workspace.members or [];
+
+        # this turns members like "foo/*" into [ "foo/bar" "foo/baz" ]
+        # as in https://github.com/rust-analyzer/rust-analyzer/blob/b2ed130ffd9c79de26249a1dfb2a8312d6af12b3/Cargo.toml#L2
+        expandMember = member:
+          if lib.hasSuffix "/*" member
+          then
+            let
+              rootDir = lib.removeSuffix "/*" member;
+              subdirs = builtins.attrNames (builtins.readDir (root + "/${rootDir}"));
+            in map (subdir: "${rootDir}/${subdir}") subdirs
+          else [ member ];
+
+      in lib.concatMap expandMember listedMembers;
+
     patchedSources =
       let
         mkRelative = po:

test.nix

@@ -128,6 +128,8 @@ rec
     cargoOptions = [ "--locked" ];
   };
 
+  cargo-wildcard = naersk.buildPackage ./test/cargo-wildcard;
+
   workspace = naersk.buildPackage ./test/workspace;
 
   workspace-patched = naersk.buildPackage ./test/workspace-patched;

test/cargo-wildcard/Cargo.lock

@@ -0,0 +1,10 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+[[package]]
+name = "crate-a"
+version = "0.1.0"
+
+[[package]]
+name = "crate-b"
+version = "0.1.0"
+

test/cargo-wildcard/Cargo.toml

@@ -0,0 +1,2 @@
+[workspace]
+members = [ "crates/*" ]

test/cargo-wildcard/crates/crate-a/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "crate-a"
+version = "0.1.0"
+authors = ["Nicolas Mattia <nicolas@nmattia.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

test/cargo-wildcard/crates/crate-a/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

test/cargo-wildcard/crates/crate-b/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "crate-b"
+version = "0.1.0"
+authors = ["Nicolas Mattia <nicolas@nmattia.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]

test/cargo-wildcard/crates/crate-b/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}

test/cargo-wildcard/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}