[PATCH v3] Move rust gitcore crate to a different subdirectory
From: Mike Hommey <hidden>
Date: 2026-09-09 02:02:41
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), rust, the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Miguel Ojeda, Linus Torvalds
Having `Cargo.toml` at the top-level of the repository implies that one
can run `cargo build` directly, but this doesn't produce anything useful
on its own.
Additionally, when including the git source as a submodule of a Rust
project, it prevents the git source from being included at all in the
crate package because cargo skips directories that contain a Cargo.toml,
assuming that everything in the directory is relevant to the crate.
This moves all Rust-specific files into a dedicated `rust/`
subdirectory.
Signed-off-by: Mike Hommey <redacted>
---
.gitignore | 2 ++
Makefile | 26 ++++++++++++++------------
meson.build | 2 +-
Cargo.toml => rust/Cargo.toml | 0
{src => rust}/cargo-meson.sh | 0
{src => rust}/meson.build | 6 +++---
{src => rust/src}/csum_file.rs | 0
{src => rust/src}/hash.rs | 0
{src => rust/src}/lib.rs | 0
{src => rust/src}/loose.rs | 0
{src => rust/src}/varint.rs | 0
11 files changed, 20 insertions(+), 16 deletions(-)
rename Cargo.toml => rust/Cargo.toml (100%)
rename {src => rust}/cargo-meson.sh (100%)
rename {src => rust}/meson.build (88%)
rename {src => rust/src}/csum_file.rs (100%)
rename {src => rust/src}/hash.rs (100%)
rename {src => rust/src}/lib.rs (100%)
rename {src => rust/src}/loose.rs (100%)
rename {src => rust/src}/varint.rs (100%)
diff --git a/.gitignore b/.gitignore
index 4da58c6754..3ac0685800 100644
--- a/.gitignore
+++ b/.gitignore@@ -261,3 +261,5 @@ Release/ /contrib/buildsystems/out /contrib/libgit-rs/target /contrib/libgit-sys/target +/rust/target +/rust/Cargo.lock
diff --git a/Makefile b/Makefile
index d4b775953d..7991fa378d 100644
--- a/Makefile
+++ b/Makefile@@ -959,7 +959,7 @@ RUST_LIB_NAME = gitcore.lib else RUST_LIB_NAME = libgitcore.a endif -RUST_LIB = target/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME) +RUST_LIB = rust/target/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME) endif GITLIBS = common-main.o $(LIB_FILE)
@@ -1571,11 +1571,13 @@ CLAR_TEST_OBJS += $(UNIT_TEST_DIR)/unit-test.o UNIT_TEST_OBJS += $(UNIT_TEST_DIR)/test-lib.o -RUST_SOURCES += src/csum_file.rs -RUST_SOURCES += src/hash.rs -RUST_SOURCES += src/lib.rs -RUST_SOURCES += src/loose.rs -RUST_SOURCES += src/varint.rs +RUST_SOURCES += rust/src/csum_file.rs +RUST_SOURCES += rust/src/hash.rs +RUST_SOURCES += rust/src/lib.rs +RUST_SOURCES += rust/src/loose.rs +RUST_SOURCES += rust/src/varint.rs +RUST_SOURCES += rust/src/lib.rs +RUST_SOURCES += rust/src/varint.rs GIT-VERSION-FILE: FORCE @OLD=$$(cat $@ 2>/dev/null || :) && \
@@ -3038,8 +3040,8 @@ $(LIB_FILE): $(LIB_OBJS) ifndef NO_RUST ifeq ($(RUST_TARGETS),) -$(RUST_LIB): Cargo.toml $(RUST_SOURCES) $(LIB_FILE) - $(QUIET_CARGO)cargo build $(CARGO_ARGS) +$(RUST_LIB): rust/Cargo.toml $(RUST_SOURCES) $(LIB_FILE) + $(QUIET_CARGO)cargo build --manifest-path rust/Cargo.toml $(CARGO_ARGS) else ifneq ($(words $(RUST_TARGETS)),1) ifneq ($(uname_S),Darwin)
@@ -3047,9 +3049,9 @@ $(error Building universal Rust libraries requires macOS (lipo is not available endif endif -RUST_MEMBER_LIBS = $(foreach target,$(RUST_TARGETS),target/$(target)/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME)) -$(RUST_MEMBER_LIBS): target/%/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME): Cargo.toml $(RUST_SOURCES) $(LIB_FILE) - $(QUIET_CARGO)cargo build $(CARGO_ARGS) --target $* +RUST_MEMBER_LIBS = $(foreach target,$(RUST_TARGETS),rust/target/$(target)/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME)) +$(RUST_MEMBER_LIBS): rust/target/%/$(RUST_BUILD_CONFIG)/$(RUST_LIB_NAME): rust/Cargo.toml $(RUST_SOURCES) $(LIB_FILE) + $(QUIET_CARGO)cargo build --manifest-path rust/Cargo.toml $(CARGO_ARGS) --target $* $(RUST_LIB): $(RUST_MEMBER_LIBS) $(call mkdir_p_parent_template)
@@ -3913,7 +3915,7 @@ clean: profile-clean coverage-clean cocciclean $(RM) $(FUZZ_PROGRAMS) $(RM) $(SP_OBJ) $(RM) $(HCC) - $(RM) -r Cargo.lock target/ + $(RM) -r Cargo.lock rust/target/ $(RM) version-def.h $(RM) -r $(dep_dirs) $(compdb_dir) compile_commands.json $(RM) $(test_bindir_programs)
diff --git a/meson.build b/meson.build
index d86f2acd2b..b91d30666e 100644
--- a/meson.build
+++ b/meson.build@@ -1782,7 +1782,7 @@ libgit_sources += version_def_h rust_option = get_option('rust') if rust_option.allowed() - subdir('src') + subdir('rust/src') libgit_c_args += '-DWITH_RUST' if host_machine.system() == 'windows'
diff --git a/Cargo.toml b/rust/Cargo.toml
similarity index 100%
rename from Cargo.toml
rename to rust/Cargo.toml
diff --git a/src/cargo-meson.sh b/rust/cargo-meson.sh
similarity index 100%
rename from src/cargo-meson.sh
rename to rust/cargo-meson.sh
diff --git a/src/meson.build b/rust/meson.build
similarity index 88%
rename from src/meson.build
rename to rust/meson.build
index 41a4b231e6..495931f75a 100644
--- a/src/meson.build
+++ b/rust/meson.build@@ -13,7 +13,7 @@ libgit_rs_sources = [ cargo_command = [ shell, meson.current_source_dir() / 'cargo-meson.sh', - meson.project_source_root(), + meson.current_source_dir(), meson.current_build_dir(), ] if get_option('buildtype') == 'release'
@@ -22,7 +22,7 @@ endif libgit_rs = custom_target('git_rs', input: libgit_rs_sources + [ - meson.project_source_root() / 'Cargo.toml', + meson.current_source_dir() / 'Cargo.toml', ], output: 'libgitcore.a', command: cargo_command,
@@ -35,7 +35,7 @@ if get_option('tests') args: [ 'test', '--manifest-path', - meson.project_source_root() / 'Cargo.toml', + meson.current_source_dir() / 'Cargo.toml', '--target-dir', meson.current_build_dir() / 'target', ],
diff --git a/src/csum_file.rs b/rust/src/csum_file.rs
similarity index 100%
rename from src/csum_file.rs
rename to rust/src/csum_file.rs
diff --git a/src/hash.rs b/rust/src/hash.rs
similarity index 100%
rename from src/hash.rs
rename to rust/src/hash.rs
diff --git a/src/lib.rs b/rust/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to rust/src/lib.rs
diff --git a/src/loose.rs b/rust/src/loose.rs
similarity index 100%
rename from src/loose.rs
rename to rust/src/loose.rs
diff --git a/src/varint.rs b/rust/src/varint.rs
similarity index 100%
rename from src/varint.rs
rename to rust/src/varint.rs
--
2.55.0.806.gb8242b093d.dirty