From 55eacf43c3638c353472c47ebdd70d33d16fbae5 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Sun, 26 Oct 2025 23:29:13 +0100 Subject: [PATCH] maint: Move to /rust/* to / This makes it easier for tooling to find the Rust stuff. Rust/non-rust is not a useful distinction in this repo anymore anyway. --- rust/Cargo.lock => Cargo.lock | 0 rust/Cargo.toml => Cargo.toml | 0 rust/bindgen-gcc.sh => bindgen-gcc.sh | 0 dev/flake-module.nix | 4 ++-- doc/hacking/test-ffi.md | 4 ++-- flake.nix | 2 +- rust/nci.nix => nci.nix | 0 .../Cargo.toml | 0 .../README.md | 0 .../build.rs | 0 .../include/nix-c-raw.h | 0 .../src/lib.rs | 0 {rust/nix-bindings-expr => nix-bindings-expr}/Cargo.toml | 0 .../nix-bindings-expr => nix-bindings-expr}/src/eval_state.rs | 0 {rust/nix-bindings-expr => nix-bindings-expr}/src/lib.rs | 0 {rust/nix-bindings-expr => nix-bindings-expr}/src/primop.rs | 0 {rust/nix-bindings-expr => nix-bindings-expr}/src/value.rs | 0 .../src/value/__private.rs | 0 .../Cargo.toml | 0 .../src/lib.rs | 0 {rust/nix-bindings-flake => nix-bindings-flake}/Cargo.toml | 0 {rust/nix-bindings-flake => nix-bindings-flake}/src/lib.rs | 0 {rust/nix-bindings-store => nix-bindings-store}/Cargo.toml | 0 {rust/nix-bindings-store => nix-bindings-store}/build.rs | 0 .../src/derivation.rs | 0 {rust/nix-bindings-store => nix-bindings-store}/src/lib.rs | 0 {rust/nix-bindings-store => nix-bindings-store}/src/path.rs | 0 {rust/nix-bindings-store => nix-bindings-store}/src/store.rs | 0 {rust/nix-bindings-util => nix-bindings-util}/Cargo.toml | 0 {rust/nix-bindings-util => nix-bindings-util}/src/context.rs | 0 {rust/nix-bindings-util => nix-bindings-util}/src/lib.rs | 0 {rust/nix-bindings-util => nix-bindings-util}/src/settings.rs | 0 .../src/string_return.rs | 0 33 files changed, 5 insertions(+), 5 deletions(-) rename rust/Cargo.lock => Cargo.lock (100%) rename rust/Cargo.toml => Cargo.toml (100%) rename rust/bindgen-gcc.sh => bindgen-gcc.sh (100%) rename rust/nci.nix => nci.nix (100%) rename {rust/nix-bindings-bindgen-raw => nix-bindings-bindgen-raw}/Cargo.toml (100%) rename {rust/nix-bindings-bindgen-raw => nix-bindings-bindgen-raw}/README.md (100%) rename {rust/nix-bindings-bindgen-raw => nix-bindings-bindgen-raw}/build.rs (100%) rename {rust/nix-bindings-bindgen-raw => nix-bindings-bindgen-raw}/include/nix-c-raw.h (100%) rename {rust/nix-bindings-bindgen-raw => nix-bindings-bindgen-raw}/src/lib.rs (100%) rename {rust/nix-bindings-expr => nix-bindings-expr}/Cargo.toml (100%) rename {rust/nix-bindings-expr => nix-bindings-expr}/src/eval_state.rs (100%) rename {rust/nix-bindings-expr => nix-bindings-expr}/src/lib.rs (100%) rename {rust/nix-bindings-expr => nix-bindings-expr}/src/primop.rs (100%) rename {rust/nix-bindings-expr => nix-bindings-expr}/src/value.rs (100%) rename {rust/nix-bindings-expr => nix-bindings-expr}/src/value/__private.rs (100%) rename {rust/nix-bindings-fetchers => nix-bindings-fetchers}/Cargo.toml (100%) rename {rust/nix-bindings-fetchers => nix-bindings-fetchers}/src/lib.rs (100%) rename {rust/nix-bindings-flake => nix-bindings-flake}/Cargo.toml (100%) rename {rust/nix-bindings-flake => nix-bindings-flake}/src/lib.rs (100%) rename {rust/nix-bindings-store => nix-bindings-store}/Cargo.toml (100%) rename {rust/nix-bindings-store => nix-bindings-store}/build.rs (100%) rename {rust/nix-bindings-store => nix-bindings-store}/src/derivation.rs (100%) rename {rust/nix-bindings-store => nix-bindings-store}/src/lib.rs (100%) rename {rust/nix-bindings-store => nix-bindings-store}/src/path.rs (100%) rename {rust/nix-bindings-store => nix-bindings-store}/src/store.rs (100%) rename {rust/nix-bindings-util => nix-bindings-util}/Cargo.toml (100%) rename {rust/nix-bindings-util => nix-bindings-util}/src/context.rs (100%) rename {rust/nix-bindings-util => nix-bindings-util}/src/lib.rs (100%) rename {rust/nix-bindings-util => nix-bindings-util}/src/settings.rs (100%) rename {rust/nix-bindings-util => nix-bindings-util}/src/string_return.rs (100%) diff --git a/rust/Cargo.lock b/Cargo.lock similarity index 100% rename from rust/Cargo.lock rename to Cargo.lock diff --git a/rust/Cargo.toml b/Cargo.toml similarity index 100% rename from rust/Cargo.toml rename to Cargo.toml diff --git a/rust/bindgen-gcc.sh b/bindgen-gcc.sh similarity index 100% rename from rust/bindgen-gcc.sh rename to bindgen-gcc.sh diff --git a/dev/flake-module.nix b/dev/flake-module.nix index 38583c1..811ae0e 100644 --- a/dev/flake-module.nix +++ b/dev/flake-module.nix @@ -16,7 +16,7 @@ pre-commit.settings.hooks.nixfmt-rfc-style.enable = true; # Temporarily disable rustfmt due to configuration issues # pre-commit.settings.hooks.rustfmt.enable = true; - pre-commit.settings.settings.rust.cargoManifestPath = "./rust/Cargo.toml"; + pre-commit.settings.settings.rust.cargoManifestPath = "./Cargo.toml"; # Check that we're using ///-style doc comments in Rust code. # @@ -78,7 +78,7 @@ ]; shellHook = '' ${config.pre-commit.installationScript} - source ${../rust/bindgen-gcc.sh} + source ${../bindgen-gcc.sh} echo 1>&2 "Welcome to the development shell!" ''; # rust-analyzer needs a NIX_PATH for some reason diff --git a/doc/hacking/test-ffi.md b/doc/hacking/test-ffi.md index 2ae260e..c19c485 100644 --- a/doc/hacking/test-ffi.md +++ b/doc/hacking/test-ffi.md @@ -3,9 +3,9 @@ If `cargo-valgrind` is broken, you may run `valgrind` manually. -1. `cd rust; cargo test -v` +1. `cargo test -v` 2. find the relevant test suite executable in the log - - example: `/home/user/src/nix-bindings-rust/rust/target/debug/deps/nix_util-036ec381a9e3fd6d` + - example: `/home/user/src/nix-bindings-rust/target/debug/deps/nix_util-036ec381a9e3fd6d` 3. `valgrind --leak-check=full ` 4. check that - `definitely lost: 0 bytes in 0 blocks` diff --git a/flake.nix b/flake.nix index af537e3..b14286b 100644 --- a/flake.nix +++ b/flake.nix @@ -21,7 +21,7 @@ imports = [ inputs.nix-cargo-integration.flakeModule inputs.flake-parts.flakeModules.partitions - ./rust/nci.nix + ./nci.nix ]; systems = [ "x86_64-linux" diff --git a/rust/nci.nix b/nci.nix similarity index 100% rename from rust/nci.nix rename to nci.nix diff --git a/rust/nix-bindings-bindgen-raw/Cargo.toml b/nix-bindings-bindgen-raw/Cargo.toml similarity index 100% rename from rust/nix-bindings-bindgen-raw/Cargo.toml rename to nix-bindings-bindgen-raw/Cargo.toml diff --git a/rust/nix-bindings-bindgen-raw/README.md b/nix-bindings-bindgen-raw/README.md similarity index 100% rename from rust/nix-bindings-bindgen-raw/README.md rename to nix-bindings-bindgen-raw/README.md diff --git a/rust/nix-bindings-bindgen-raw/build.rs b/nix-bindings-bindgen-raw/build.rs similarity index 100% rename from rust/nix-bindings-bindgen-raw/build.rs rename to nix-bindings-bindgen-raw/build.rs diff --git a/rust/nix-bindings-bindgen-raw/include/nix-c-raw.h b/nix-bindings-bindgen-raw/include/nix-c-raw.h similarity index 100% rename from rust/nix-bindings-bindgen-raw/include/nix-c-raw.h rename to nix-bindings-bindgen-raw/include/nix-c-raw.h diff --git a/rust/nix-bindings-bindgen-raw/src/lib.rs b/nix-bindings-bindgen-raw/src/lib.rs similarity index 100% rename from rust/nix-bindings-bindgen-raw/src/lib.rs rename to nix-bindings-bindgen-raw/src/lib.rs diff --git a/rust/nix-bindings-expr/Cargo.toml b/nix-bindings-expr/Cargo.toml similarity index 100% rename from rust/nix-bindings-expr/Cargo.toml rename to nix-bindings-expr/Cargo.toml diff --git a/rust/nix-bindings-expr/src/eval_state.rs b/nix-bindings-expr/src/eval_state.rs similarity index 100% rename from rust/nix-bindings-expr/src/eval_state.rs rename to nix-bindings-expr/src/eval_state.rs diff --git a/rust/nix-bindings-expr/src/lib.rs b/nix-bindings-expr/src/lib.rs similarity index 100% rename from rust/nix-bindings-expr/src/lib.rs rename to nix-bindings-expr/src/lib.rs diff --git a/rust/nix-bindings-expr/src/primop.rs b/nix-bindings-expr/src/primop.rs similarity index 100% rename from rust/nix-bindings-expr/src/primop.rs rename to nix-bindings-expr/src/primop.rs diff --git a/rust/nix-bindings-expr/src/value.rs b/nix-bindings-expr/src/value.rs similarity index 100% rename from rust/nix-bindings-expr/src/value.rs rename to nix-bindings-expr/src/value.rs diff --git a/rust/nix-bindings-expr/src/value/__private.rs b/nix-bindings-expr/src/value/__private.rs similarity index 100% rename from rust/nix-bindings-expr/src/value/__private.rs rename to nix-bindings-expr/src/value/__private.rs diff --git a/rust/nix-bindings-fetchers/Cargo.toml b/nix-bindings-fetchers/Cargo.toml similarity index 100% rename from rust/nix-bindings-fetchers/Cargo.toml rename to nix-bindings-fetchers/Cargo.toml diff --git a/rust/nix-bindings-fetchers/src/lib.rs b/nix-bindings-fetchers/src/lib.rs similarity index 100% rename from rust/nix-bindings-fetchers/src/lib.rs rename to nix-bindings-fetchers/src/lib.rs diff --git a/rust/nix-bindings-flake/Cargo.toml b/nix-bindings-flake/Cargo.toml similarity index 100% rename from rust/nix-bindings-flake/Cargo.toml rename to nix-bindings-flake/Cargo.toml diff --git a/rust/nix-bindings-flake/src/lib.rs b/nix-bindings-flake/src/lib.rs similarity index 100% rename from rust/nix-bindings-flake/src/lib.rs rename to nix-bindings-flake/src/lib.rs diff --git a/rust/nix-bindings-store/Cargo.toml b/nix-bindings-store/Cargo.toml similarity index 100% rename from rust/nix-bindings-store/Cargo.toml rename to nix-bindings-store/Cargo.toml diff --git a/rust/nix-bindings-store/build.rs b/nix-bindings-store/build.rs similarity index 100% rename from rust/nix-bindings-store/build.rs rename to nix-bindings-store/build.rs diff --git a/rust/nix-bindings-store/src/derivation.rs b/nix-bindings-store/src/derivation.rs similarity index 100% rename from rust/nix-bindings-store/src/derivation.rs rename to nix-bindings-store/src/derivation.rs diff --git a/rust/nix-bindings-store/src/lib.rs b/nix-bindings-store/src/lib.rs similarity index 100% rename from rust/nix-bindings-store/src/lib.rs rename to nix-bindings-store/src/lib.rs diff --git a/rust/nix-bindings-store/src/path.rs b/nix-bindings-store/src/path.rs similarity index 100% rename from rust/nix-bindings-store/src/path.rs rename to nix-bindings-store/src/path.rs diff --git a/rust/nix-bindings-store/src/store.rs b/nix-bindings-store/src/store.rs similarity index 100% rename from rust/nix-bindings-store/src/store.rs rename to nix-bindings-store/src/store.rs diff --git a/rust/nix-bindings-util/Cargo.toml b/nix-bindings-util/Cargo.toml similarity index 100% rename from rust/nix-bindings-util/Cargo.toml rename to nix-bindings-util/Cargo.toml diff --git a/rust/nix-bindings-util/src/context.rs b/nix-bindings-util/src/context.rs similarity index 100% rename from rust/nix-bindings-util/src/context.rs rename to nix-bindings-util/src/context.rs diff --git a/rust/nix-bindings-util/src/lib.rs b/nix-bindings-util/src/lib.rs similarity index 100% rename from rust/nix-bindings-util/src/lib.rs rename to nix-bindings-util/src/lib.rs diff --git a/rust/nix-bindings-util/src/settings.rs b/nix-bindings-util/src/settings.rs similarity index 100% rename from rust/nix-bindings-util/src/settings.rs rename to nix-bindings-util/src/settings.rs diff --git a/rust/nix-bindings-util/src/string_return.rs b/nix-bindings-util/src/string_return.rs similarity index 100% rename from rust/nix-bindings-util/src/string_return.rs rename to nix-bindings-util/src/string_return.rs