Merge pull request ClickHouse#79560 from ClickHouse/fix-rust-src-vendoring

Fix Rust src vendoring

Author: thevar1able

contrib/corrosion-cmake/config.toml.in

@@ -9,15 +9,12 @@ lto = true
 
 [source.crates-io]
 registry = 'sparse+https://index.crates.io/'
-replace-with = 'local-registry'
+replace-with = 'vendored-sources'
 
 [source."git+https://github.com/azat-rust/tuikit.git?rev=e1994c0e03ff02c49cf1471f0cc3cbf185ce0104"]
 git = "https://github.com/azat-rust/tuikit.git"
 rev = "e1994c0e03ff02c49cf1471f0cc3cbf185ce0104"
 replace-with = "vendored-sources"
 
-[source.local-registry]
-local-registry = "@RUST_VENDOR_DIR@"
-
 [source.vendored-sources]
 directory = "@RUST_VENDOR_DIR@"

contrib/delta-kernel-rs

@@ -24,8 +24,9 @@ endif()
 # * default-engine: Needed for its s3 client (we can't pass our own s3 client via ffi)
 # * delta_kernel/cloud: s3 client
 clickhouse_import_crate(
-        MANIFEST_PATH "${DELTA_KERNEL_RS_SOURCE_DIR}/ffi/Cargo.toml"
-        FEATURES "default-engine, delta_kernel/cloud")
+    MANIFEST_PATH "${DELTA_KERNEL_RS_SOURCE_DIR}/ffi/Cargo.toml"
+    FEATURES "default-engine, delta_kernel/cloud"
+)
 clickhouse_config_crate_flags(delta_kernel_ffi)
 
 # We use our own OpenSSL headers and libs

contrib/delta-kernel-rs-cmake/CMakeLists.txt

@@ -10,16 +10,7 @@ so you need to install `rustup component add rust-src` for the specific version.
 cargo generate-lockfile
 ```
 
-* Generate the local registry:
-
-Note that we use both commands to vendor both registry and crates. No idea why both are necessary.
-
-  * First we need to install the tool if you don't already have it:
-```bash
-cargo install --version 0.2.7 cargo-local-registry
-```
-
-  * Now add the local packages:
+* Generate the vendor dir:
 
 ```bash
 export CH_TOP_DIR=$(git rev-parse --show-toplevel)
@@ -31,33 +22,16 @@ export DELTA_LAKE_DIR="$CH_TOP_DIR"/contrib/delta-kernel-rs
 rm -rf "$CH_TOP_DIR"/contrib/rust_vendor/*
 
 cd "$CH_TOP_DIR"/rust/workspace
-cargo local-registry --git --sync Cargo.lock "$CH_TOP_DIR"/contrib/rust_vendor
+cargo vendor --no-delete --locked --versioned-dirs --manifest-path Cargo.toml "$CH_TOP_DIR"/contrib/rust_vendor
 
 # Now handle delta-lake
 cd "$DELTA_LAKE_DIR"
-cargo local-registry --no-delete --git --sync "$DELTA_LAKE_DIR/Cargo.lock" "$CH_TOP_DIR"/contrib/rust_vendor
+cargo vendor --no-delete --locked --versioned-dirs --manifest-path Cargo.toml "$CH_TOP_DIR"/contrib/rust_vendor
 
 # Standard library deps
-cp "$RUSTC_ROOT"/lib/rustlib/src/rust/library/Cargo.lock "$RUSTC_ROOT"/lib/rustlib/src/rust/library/std/
-cargo local-registry --no-delete --git --sync "$RUSTC_ROOT"/lib/rustlib/src/rust/library/std/Cargo.lock "$CH_TOP_DIR"/contrib/rust_vendor
-cp "$RUSTC_ROOT"/lib/rustlib/src/rust/library/Cargo.lock "$RUSTC_ROOT"/lib/rustlib/src/rust/library/test/
-cargo local-registry --no-delete --git --sync "$RUSTC_ROOT"/lib/rustlib/src/rust/library/test/Cargo.lock "$CH_TOP_DIR"/contrib/rust_vendor
-
-# Now we vendor the modules themselves
-cd "$CH_TOP_DIR"/rust/workspace
-cargo vendor --no-delete --locked "$CH_TOP_DIR"/contrib/rust_vendor
-cd "$DELTA_LAKE_DIR"
-cargo vendor --no-delete --locked "$CH_TOP_DIR"/contrib/rust_vendor
-cd "$RUSTC_ROOT"/lib/rustlib/src/rust/library/std/
-cargo vendor --no-delete "$CH_TOP_DIR"/contrib/rust_vendor
-cd "$RUSTC_ROOT"/lib/rustlib/src/rust/library/test/
-cargo vendor --no-delete "$CH_TOP_DIR"/contrib/rust_vendor
-
-# Remove windows only dependencies (which are really heavy and we don't want in the repo)
-rm -rf "$CH_TOP_DIR"/contrib/rust_vendor/winapi* "$CH_TOP_DIR"/contrib/rust_vendor/windows*
+cargo vendor --no-delete --locked --versioned-dirs --manifest-path "$RUSTC_ROOT"/lib/rustlib/src/rust/library/std/Cargo.toml "$CH_TOP_DIR"/contrib/rust_vendor
+cargo vendor --no-delete --locked --versioned-dirs --manifest-path "$RUSTC_ROOT"/lib/rustlib/src/rust/library/test/Cargo.toml "$CH_TOP_DIR"/contrib/rust_vendor
 
-# Cleanup the lock files we copied
-rm "$RUSTC_ROOT"/lib/rustlib/src/rust/library/std/Cargo.lock "$RUSTC_ROOT"/lib/rustlib/src/rust/library/test/Cargo.lock
 cd "$CH_TOP_DIR"/rust/workspace
 ```