Merge branch 'main' into szg251/rust-testsuites

Author: szg251

extras/flake-rust.nix

@@ -1,16 +1,16 @@
 pkgs:
 
-{ crane, src, crateName, extraSources ? [ ], extraSourcesDir ? ".extras", data ? [ ], dataDir ? "data", devShellHook ? "", devShellTools ? [ ], testTools ? [ ] }:
+{ crane, src, crateName, rustVersion ? "latest", extraSources ? [ ], extraSourcesDir ? ".extras", data ? [ ], dataDir ? "data", devShellHook ? "", devShellTools ? [ ], testTools ? [ ] }:
 let
-  rustWithTools = pkgs.rust-bin.stable.latest.default.override {
+  rustWithTools = pkgs.rust-bin.stable.${rustVersion}.default.override {
     extensions = [ "rustfmt" "rust-analyzer" "clippy" "rust-src" ];
   };
   craneLib = crane.lib.${pkgs.system}.overrideToolchain rustWithTools;
 
   cleanSrc = craneLib.cleanCargoSource (craneLib.path src);
 
-  # Library source code with extra dependencies attached
-  fullSrc =
+  # Library source code with extra dependencies copied
+  buildEnv =
     pkgs.stdenv.mkDerivation
       {
         src = cleanSrc;
@@ -24,6 +24,9 @@ let
         '';
       };
 
+  # Library source code, intended to be in extra-sources (inside the `.extras` directory)
+  # The main difference is that dependencies are not copied, to `.extras`
+  # but they are referenced from the parent directory (`../`).
   vendoredSrc =
     pkgs.stdenv.mkDerivation
       {
@@ -38,7 +41,7 @@ let
       };
 
   commonArgs = {
-    src = fullSrc;
+    src = buildEnv;
     pname = crateName;
     strictDeps = true;
   };
@@ -89,6 +92,8 @@ in
 
   packages."${crateName}-rust-src" = vendoredSrc;
 
+  packages."${crateName}-rust-build-env" = buildEnv;
+
   checks."${crateName}-rust-test" = craneLib.cargoNextest (commonArgs // {
     inherit cargoArtifacts;
     nativeBuildInputs = testTools;

extras/lbf-nix/lbf-rust.nix

@@ -20,14 +20,14 @@ let
       files
       # Classes for which to generate implementations for (default lbf-prelude classes).
     , classes ? [ ]
-    , # Dependencies to include in the Cabal's `build-depends` stanza.
+    , # Dependencies to include in the Cargo's `dependencies` section.
       # examples: dependencies = [ "lbf-prelude" ]
       dependencies ? [ ]
     , configs ? [ ]
-    , # Name of the package and also the name of the Cabal package.
+    , # Name of the package and also the name of the Cargo crate.
       # Examples: name = "lbf-myproject"
       name
-    , # Version of the package and also the version of the Cabal package.
+    , # Version of the package and also the version of the Cargo crate.
       # Examples: version = "0.1.0.0"
       version ? "0.1.0"
     }: { inherit src imports files classes dependencies configs name version; };
@@ -67,7 +67,7 @@ let
 
   cargoTemplate = opts: with (lbfRustOpts opts);
     pkgs.writeTextFile {
-      name = "lambda-buffers-cabal-template";
+      name = "lambda-buffers-cargo-template";
       text = ''
         [package]
         name = "${name}"
@@ -78,6 +78,9 @@ let
       '';
     };
 
+  # This is a lookup table of default crate versions used by lamba-buffers modules
+  # Based on the contents of `build.json` a subset of these will be attached to the
+  # Cargo.toml file
   crateVersions = pkgs.writeTextFile {
     name = "lambda-buffers-crate-versions";
     text = ''
@@ -107,6 +110,10 @@ let
         DEPS=$(echo ${builtins.concatStringsSep " " dependencies} $(cat build.json | jq -r ".[]" | sort -u));
         echo "Gathered Cargo deps $DEPS";
         cat ${cargoTemplate opts} > Cargo.toml;
+        # Using the lookup table `crateVersions`, filling in the library version.
+        # If no version is found, we default to a local path dependency, pointing to
+        # a sibling directory (directory in extra-sources or .extras)
+        # e.g.: for `lbr-prelude` we print `lbr-prelude = { path = "../lbr-prelude" }
         for DEP in $DEPS; do
           if [ $DEP != "std" ]; then
             echo "$(cat ${crateVersions} | grep "$DEP" || echo "$DEP = { path = \"../$DEP\" }")" >> Cargo.toml
@@ -127,6 +134,10 @@ let
         chmod -R u+w $out/src
         pushd $out/src
 
+        # Collecting modules of the library and attaching a module declaration
+        # to parent modules. Any directory in the path must also
+        # be considered as a module (e.g. for `foo/bar/baz.rs` we have to create
+        # `lib.rs`, `foo.rs`and `foo/bar.rs`)
         MODS=$(find . -type f -name "*.rs")
         MODS+=" "
         MODS+=$(find . -type d)