From 1a31e36639a94eab1afa78c1a32d876cb36f9d0d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 30 May 2024 05:59:32 +0200 Subject: Adding debian version 1.73.0+dfsg1-1. Signed-off-by: Daniel Baumann --- debian/patches/c-2002_disable-net-tests.patch | 44 +- debian/patches/c-update-libgit2.patch | 26 +- .../patches/d-0000-ignore-removed-submodules.patch | 44 +- .../d-0001-pkg-config-no-special-snowflake.patch | 2 +- .../d-0002-mdbook-strip-embedded-libs.patch | 2 +- debian/patches/d-0005-no-jemalloc.patch | 4 +- .../d-0010-cargo-remove-vendored-c-crates.patch | 5 +- debian/patches/d-0011-cargo-remove-nghttp2.patch | 2 +- .../d-0020-remove-windows-dependencies.patch | 119 ++-- ...d-0021-vendor-remove-windows-dependencies.patch | 674 +++++++++++++-------- debian/patches/d-bootstrap-cargo-doc-paths.patch | 4 +- .../d-bootstrap-custom-debuginfo-path.patch | 4 +- debian/patches/d-fix-rustix-outline.patch | 98 +-- debian/patches/d-rust-lldb-paths | 2 +- debian/patches/series | 1 - debian/patches/u-profiler.patch | 139 ----- 16 files changed, 557 insertions(+), 613 deletions(-) delete mode 100644 debian/patches/u-profiler.patch (limited to 'debian/patches') diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch index 3f8926877..a3f7d112d 100644 --- a/debian/patches/c-2002_disable-net-tests.patch +++ b/debian/patches/c-2002_disable-net-tests.patch @@ -523,7 +523,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs =================================================================== --- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs +++ rust/src/tools/cargo/tests/testsuite/credential_process.rs -@@ -8,7 +8,7 @@ fn toml_bin(proj: &Project, name: &str) +@@ -7,7 +7,7 @@ fn toml_bin(proj: &Project, name: &str) proj.bin(name).display().to_string().replace('\\', "\\\\") } @@ -532,16 +532,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn gated() { let _alternative = registry::RegistryBuilder::new() .alternative() -@@ -65,7 +65,7 @@ or use environment variable CARGO_REGIST - .run(); - } - --#[cargo_test] -+#[allow(dead_code)] - fn warn_both_token_and_process() { - // Specifying both credential-process and a token in config should issue a warning. - let _server = registry::RegistryBuilder::new() -@@ -212,7 +212,7 @@ fn get_token_test() -> (Project, TestReg +@@ -120,7 +120,7 @@ fn get_token_test() -> (Project, TestReg (p, server) } @@ -550,8 +541,8 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn publish() { // Checks that credential-process is used for `cargo publish`. let (p, _t) = get_token_test(); -@@ -237,7 +237,7 @@ You may press ctrl-c [..] - assert_eq!(calls, 1); +@@ -143,7 +143,7 @@ You may press ctrl-c [..] + .run(); } -#[cargo_test] @@ -559,17 +550,17 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn basic_unsupported() { // Non-action commands don't support login/logout. let registry = registry::RegistryBuilder::new() -@@ -280,7 +280,7 @@ the credential-process configuration val +@@ -181,7 +181,7 @@ Caused by: .run(); } -#[cargo_test] +#[allow(dead_code)] fn login() { - let server = registry::RegistryBuilder::new() + let registry = registry::RegistryBuilder::new() .no_configure_token() -@@ -337,7 +337,7 @@ fn login() { - ); +@@ -203,7 +203,7 @@ fn login() { + .run(); } -#[cargo_test] @@ -577,8 +568,8 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn logout() { let server = registry::RegistryBuilder::new() .no_configure_token() -@@ -395,7 +395,7 @@ token for `crates-io` has been erased! - ); +@@ -223,7 +223,7 @@ fn logout() { + .run(); } -#[cargo_test] @@ -586,7 +577,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn yank() { let (p, _t) = get_token_test(); -@@ -410,7 +410,7 @@ fn yank() { +@@ -239,7 +239,7 @@ fn yank() { .run(); } @@ -595,16 +586,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs fn owner() { let (p, _t) = get_token_test(); -@@ -425,7 +425,7 @@ fn owner() { - .run(); - } - --#[cargo_test] -+#[allow(dead_code)] - fn libexec_path() { - // cargo: prefixed names use the sysroot - let server = registry::RegistryBuilder::new() -@@ -459,7 +459,7 @@ Caused by: +@@ -255,7 +255,7 @@ fn owner() { .run(); } @@ -612,4 +594,4 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs +#[allow(dead_code)] fn invalid_token_output() { // Error when credential process does not output the expected format for a token. - let _server = registry::RegistryBuilder::new() + let cred_proj = project() diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch index 192571e46..c1d59a40a 100644 --- a/debian/patches/c-update-libgit2.patch +++ b/debian/patches/c-update-libgit2.patch @@ -2,26 +2,26 @@ Index: rust/src/tools/cargo/Cargo.toml =================================================================== --- rust.orig/src/tools/cargo/Cargo.toml +++ rust/src/tools/cargo/Cargo.toml -@@ -33,8 +33,8 @@ env_logger = "0.10.0" - filetime = "0.2.9" - flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] } +@@ -37,8 +37,8 @@ curl-sys = "0.4.65" + filetime = "0.2.21" + flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] } fwdansi = "1.1.0" --git2 = "0.17.1" +-git2 = "0.17.2" -git2-curl = "0.18.0" +git2 = "0.18" +git2-curl = "0.19.0" gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] } gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] } - glob = "0.3.0" -@@ -52,7 +52,7 @@ jobserver = "0.1.26" - lazy_static = "1.3.0" - lazycell = "1.2.0" - libc = "0.2.144" --libgit2-sys = "0.15.1" + glob = "0.3.1" +@@ -56,7 +56,7 @@ jobserver = "0.1.26" + lazy_static = "1.4.0" + lazycell = "1.3.0" + libc = "0.2.147" +-libgit2-sys = "0.15.2" +libgit2-sys = "0.16.1" - log = "0.4.17" - memchr = "2.1.3" - miow = "0.5.0" + libloading = "0.8.0" + memchr = "2.5.0" + miow = "0.6.0" Index: rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml =================================================================== --- rust.orig/src/tools/cargo/crates/cargo-test-support/Cargo.toml diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch index 1cea0a8bf..3542cd9c5 100644 --- a/debian/patches/d-0000-ignore-removed-submodules.patch +++ b/debian/patches/d-0000-ignore-removed-submodules.patch @@ -4,17 +4,17 @@ Subject: d-0000-ignore-removed-submodules --- Cargo.toml | 7 ----- - src/bootstrap/bootstrap.py | 6 +---- + src/bootstrap/bootstrap.py | 4 --- src/bootstrap/builder.rs | 54 +++++++++----------------------------- src/bootstrap/test.rs | 12 +-------- src/tools/rust-analyzer/Cargo.toml | 11 +++++++- - 5 files changed, 25 insertions(+), 65 deletions(-) + 5 files changed, 24 insertions(+), 64 deletions(-) diff --git a/Cargo.toml b/Cargo.toml -index 20b1c65..16d4ebe 100644 +index d2e84d5..a852385 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -20,22 +20,15 @@ members = [ +@@ -19,22 +19,15 @@ members = [ "src/tools/tidy", "src/tools/tier-check", "src/tools/build-manifest", @@ -38,10 +38,10 @@ index 20b1c65..16d4ebe 100644 "src/tools/lld-wrapper", "src/tools/collect-license-metadata", diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py -index 149350e..2813c89 100644 +index f44a05a..27da09c 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py -@@ -946,10 +946,6 @@ class RustBuild(object): +@@ -944,10 +944,6 @@ class RustBuild(object): args = [self.cargo(), "build", "--manifest-path", os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] args.extend("--verbose" for _ in range(self.verbose)) @@ -53,10 +53,10 @@ index 149350e..2813c89 100644 args.append("--features") args.append("build-metrics") diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs -index 05b66f9..ff1f0eb 100644 +index b366619..8866581 100644 --- a/src/bootstrap/builder.rs +++ b/src/bootstrap/builder.rs -@@ -459,20 +459,20 @@ impl<'a> ShouldRun<'a> { +@@ -497,20 +497,20 @@ impl<'a> ShouldRun<'a> { static SUBMODULES_PATHS: OnceCell> = OnceCell::new(); let init_submodules_paths = |src: &PathBuf| { @@ -89,7 +89,7 @@ index 05b66f9..ff1f0eb 100644 submodules_paths }; -@@ -646,25 +646,14 @@ impl<'a> Builder<'a> { +@@ -684,25 +684,14 @@ impl<'a> Builder<'a> { tool::Linkchecker, tool::CargoTest, tool::Compiletest, @@ -112,10 +112,10 @@ index 05b66f9..ff1f0eb 100644 - llvm::Lld, - llvm::CrtBeginEnd, - tool::RustdocGUITest, + tool::OptimizedDist ), Kind::Check | Kind::Clippy | Kind::Fix => describe!( - check::Std, -@@ -672,12 +661,7 @@ impl<'a> Builder<'a> { +@@ -711,12 +700,7 @@ impl<'a> Builder<'a> { check::Rustdoc, check::CodegenBackend, check::Clippy, @@ -128,7 +128,7 @@ index 05b66f9..ff1f0eb 100644 check::Bootstrap ), Kind::Test => describe!( -@@ -706,7 +690,6 @@ impl<'a> Builder<'a> { +@@ -745,7 +729,6 @@ impl<'a> Builder<'a> { test::TierCheck, test::Cargotest, test::Cargo, @@ -136,7 +136,7 @@ index 05b66f9..ff1f0eb 100644 test::ErrorIndex, test::Distcheck, test::RunMakeFullDeps, -@@ -722,7 +705,6 @@ impl<'a> Builder<'a> { +@@ -761,7 +744,6 @@ impl<'a> Builder<'a> { test::EmbeddedBook, test::EditionGuide, test::Rustfmt, @@ -144,7 +144,7 @@ index 05b66f9..ff1f0eb 100644 test::Clippy, test::RustDemangler, test::CompiletestTest, -@@ -759,7 +741,6 @@ impl<'a> Builder<'a> { +@@ -798,7 +780,6 @@ impl<'a> Builder<'a> { doc::CargoBook, doc::Clippy, doc::ClippyBook, @@ -152,7 +152,7 @@ index 05b66f9..ff1f0eb 100644 doc::EmbeddedBook, doc::EditionGuide, doc::StyleGuide, -@@ -777,12 +758,9 @@ impl<'a> Builder<'a> { +@@ -816,12 +797,9 @@ impl<'a> Builder<'a> { dist::Analysis, dist::Src, dist::Cargo, @@ -165,7 +165,7 @@ index 05b66f9..ff1f0eb 100644 dist::LlvmTools, dist::RustDev, dist::Bootstrap, -@@ -799,11 +777,9 @@ impl<'a> Builder<'a> { +@@ -838,11 +816,9 @@ impl<'a> Builder<'a> { install::Docs, install::Std, install::Cargo, @@ -177,7 +177,7 @@ index 05b66f9..ff1f0eb 100644 install::LlvmTools, install::Src, install::Rustc -@@ -813,7 +789,6 @@ impl<'a> Builder<'a> { +@@ -852,7 +828,6 @@ impl<'a> Builder<'a> { run::BuildManifest, run::BumpStage0, run::ReplaceVersionPlaceholder, @@ -185,7 +185,7 @@ index 05b66f9..ff1f0eb 100644 run::CollectLicenseMetadata, run::GenerateCopyright, run::GenerateWindowsSys, -@@ -1965,10 +1940,7 @@ impl<'a> Builder<'a> { +@@ -1990,10 +1965,7 @@ impl<'a> Builder<'a> { } } @@ -198,10 +198,10 @@ index 05b66f9..ff1f0eb 100644 } diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs -index eed7a58..c3bf972 100644 +index d0d62db..3c4c4e3 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs -@@ -2129,17 +2129,7 @@ impl Step for RustcGuide { +@@ -2143,17 +2143,7 @@ impl Step for RustcGuide { } fn run(self, builder: &Builder<'_>) { @@ -210,7 +210,7 @@ index eed7a58..c3bf972 100644 - - let src = builder.src.join(relative_path); - let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook); -- let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() { +- let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) { - ToolState::TestPass - } else { - ToolState::TestFail @@ -221,7 +221,7 @@ index eed7a58..c3bf972 100644 } diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml -index 3050cf7..174e1f0 100644 +index f6a50bf..bd38d4f 100644 --- a/src/tools/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/Cargo.toml @@ -1,5 +1,14 @@ diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch index 4cdf7fbbb..bae687742 100644 --- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch +++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch @@ -8,7 +8,7 @@ Subject: d-0001-pkg-config-no-special-snowflake 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs -index 3653032..7b82fa5 100644 +index 3653032..553ac75 100644 --- a/vendor/pkg-config/src/lib.rs +++ b/vendor/pkg-config/src/lib.rs @@ -117,11 +117,8 @@ pub enum Error { diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch index c6acfd458..6e7914c45 100644 --- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch +++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch @@ -14,7 +14,7 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase 7 files changed, 47 insertions(+), 234 deletions(-) diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs -index c8a3700..4095c03 100644 +index 7f73cac..e4805cc 100644 --- a/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs @@ -159,7 +159,17 @@ impl Checker { diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch index 09b8db752..a947d676b 100644 --- a/debian/patches/d-0005-no-jemalloc.patch +++ b/debian/patches/d-0005-no-jemalloc.patch @@ -26,12 +26,12 @@ index 41003ad..0578f7b 100644 max_level_info = ['rustc_driver_impl/max_level_info'] rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler'] diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml -index 602e742..5faecc5 100644 +index 937834a..fd98d85 100644 --- a/src/tools/rust-analyzer/crates/profile/Cargo.toml +++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml @@ -17,7 +17,6 @@ cfg-if = "1.0.0" libc = "0.2.135" - la-arena = { version = "0.3.0", path = "../../lib/la-arena" } + la-arena.workspace = true countme = { version = "3.0.1", features = ["enable"] } -jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true } diff --git a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch index 21e1e0b06..1e8c91ca6 100644 --- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch +++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch @@ -8,16 +8,15 @@ Last-Update: 2023-05-17 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml -index 7e383be..384fe45 100644 +index 0e189a6..4071e8c 100644 --- a/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml -@@ -203,8 +203,6 @@ test = false +@@ -217,7 +217,5 @@ test = false doc = false [features] -vendored-openssl = ["openssl/vendored"] -vendored-libgit2 = ["libgit2-sys/vendored"] +# Debian: removed vendoring flags - pretty-env-logger = ["pretty_env_logger"] # This is primarily used by rust-lang/rust distributing cargo the executable. -all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx'] diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch index b9a1f1b69..ef2fe174f 100644 --- a/debian/patches/d-0011-cargo-remove-nghttp2.patch +++ b/debian/patches/d-0011-cargo-remove-nghttp2.patch @@ -8,7 +8,7 @@ Last-Update: 2023-05-17 Box::new(TokenCredential::new(config)), + "cargo:paseto" => Box::new(PasetoCredential::new(config)), + "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}), +- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}), +- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}), + "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}), + process => Box::new(CredentialProcessCredential::new(process)), + }; diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch index 146c95eff..d925753da 100644 --- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch +++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch @@ -7,69 +7,78 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Fabian Grünbichler --- - vendor/android-tzdata/Cargo.toml | 1 + - vendor/anstream/Cargo.toml | 6 ----- - vendor/anstyle-query/Cargo.toml | 7 ------ - vendor/atty/Cargo.toml | 3 --- - vendor/backtrace-0.3.67/Cargo.toml | 14 ------------ - vendor/backtrace/Cargo.toml | 13 ----------- - vendor/chrono/Cargo.toml | 12 ---------- - vendor/colored/Cargo.toml | 4 ---- - vendor/curl-sys/Cargo.toml | 10 --------- - vendor/curl/Cargo.toml | 10 --------- - vendor/dirs-sys-next/Cargo.toml | 3 --- - vendor/dirs-sys/Cargo.toml | 3 --- - vendor/errno/Cargo.toml | 6 ----- - vendor/fd-lock/Cargo.toml | 8 ------- - vendor/filetime/Cargo.toml | 7 ------ - vendor/gix-sec/Cargo.toml | 12 ---------- - vendor/home/Cargo.toml | 7 ------ - vendor/iana-time-zone/Cargo.toml | 4 ---- - vendor/ignore/Cargo.toml | 3 --- - vendor/io-close/Cargo.toml | 3 --- - vendor/io-lifetimes/Cargo.toml | 13 ----------- - vendor/is-terminal-0.4.7/Cargo.toml | 11 --------- - vendor/is-terminal/Cargo.toml | 11 --------- - vendor/libloading/Cargo.toml | 7 ------ - vendor/libssh2-sys/Cargo.toml | 5 ----- - vendor/nu-ansi-term/Cargo.toml | 10 --------- - vendor/opener/Cargo.toml | 4 ---- - vendor/os_info/Cargo.toml | 15 ------------- - vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ---------- - vendor/parking_lot_core/Cargo.toml | 3 --- - vendor/pretty_assertions/Cargo.toml | 6 ----- - vendor/rustix-0.37.11/Cargo.toml | 11 --------- - vendor/rustix-0.37.20/Cargo.toml | 16 -------------- - vendor/rustix/Cargo.toml | 17 -------------- - vendor/same-file/Cargo.toml | 2 -- - vendor/snapbox/Cargo.toml | 6 ----- - vendor/socket2/Cargo.toml | 8 ------- - vendor/stacker/Cargo.toml | 10 --------- - vendor/sysinfo/Cargo.toml | 38 -------------------------------- - vendor/tempfile/Cargo.toml | 7 ------ - vendor/term/Cargo.toml | 6 ----- - vendor/termcolor/Cargo.toml | 3 --- - vendor/terminal_size/Cargo.toml | 7 ------ - vendor/termize/Cargo.toml | 3 --- - vendor/tokio/Cargo.toml | 21 ------------------ - vendor/uuid/Cargo.toml | 4 ---- - vendor/walkdir/Cargo.toml | 3 --- - vendor/yansi-term/Cargo.toml | 3 --- - 48 files changed, 1 insertion(+), 397 deletions(-) + vendor/android-tzdata/Cargo.toml | 1 + + vendor/anstream/Cargo.toml | 6 ---- + vendor/anstyle-query/Cargo.toml | 7 ----- + vendor/atty/Cargo.toml | 3 -- + vendor/backtrace/Cargo.toml | 13 --------- + vendor/chrono/Cargo.toml | 12 -------- + vendor/colored/Cargo.toml | 4 --- + vendor/curl-sys-0.4.63+curl-8.1.2/Cargo.toml | 10 ------- + vendor/curl-sys/Cargo.toml | 10 ------- + vendor/curl/Cargo.toml | 10 ------- + vendor/dirs-sys-next/Cargo.toml | 3 -- + vendor/dirs-sys/Cargo.toml | 3 -- + vendor/errno/Cargo.toml | 6 ---- + vendor/fd-lock/Cargo.toml | 8 ------ + vendor/filetime/Cargo.toml | 7 ----- + vendor/gix-sec/Cargo.toml | 12 -------- + vendor/home/Cargo.toml | 7 ----- + vendor/iana-time-zone/Cargo.toml | 4 --- + vendor/ignore/Cargo.toml | 3 -- + vendor/io-close/Cargo.toml | 3 -- + vendor/io-lifetimes/Cargo.toml | 13 --------- + vendor/is-terminal/Cargo.toml | 11 -------- + vendor/libloading-0.7.4/Cargo.toml | 6 ---- + vendor/libloading/Cargo.toml | 8 ------ + vendor/libssh2-sys/Cargo.toml | 8 ------ + vendor/libz-sys/Cargo.toml | 3 -- + vendor/mio/Cargo.toml | 11 -------- + vendor/native-tls/Cargo.toml | 3 -- + vendor/normpath/Cargo.toml | 10 ------- + vendor/nu-ansi-term/Cargo.toml | 10 ------- + vendor/opener-0.5.2/Cargo.toml | 4 --- + vendor/opener/Cargo.toml | 9 ------ + vendor/openssl-sys/Cargo.toml | 3 -- + vendor/os_info/Cargo.toml | 15 ---------- + vendor/parking_lot_core-0.8.6/Cargo.toml | 12 -------- + vendor/parking_lot_core/Cargo.toml | 3 -- + vendor/pretty_assertions-1.3.0/Cargo.toml | 6 ---- + vendor/reqwest/Cargo.toml | 3 -- + vendor/rustix-0.37.20/Cargo.toml | 16 ----------- + vendor/rustix-0.37.22/Cargo.toml | 16 ----------- + vendor/rustix/Cargo.toml | 17 ------------ + vendor/same-file/Cargo.toml | 2 -- + vendor/snapbox/Cargo.toml | 6 ---- + vendor/socket2/Cargo.toml | 8 ------ + vendor/stacker/Cargo.toml | 10 ------- + vendor/sysinfo-0.26.7/Cargo.toml | 38 -------------------------- + vendor/sysinfo/Cargo.toml | 41 ---------------------------- + vendor/tempfile-3.6.0/Cargo.toml | 7 ----- + vendor/tempfile/Cargo.toml | 7 ----- + vendor/term/Cargo.toml | 6 ---- + vendor/termcolor/Cargo.toml | 3 -- + vendor/terminal_size/Cargo.toml | 7 ----- + vendor/termize/Cargo.toml | 3 -- + vendor/tokio/Cargo.toml | 21 -------------- + vendor/uuid/Cargo.toml | 4 --- + vendor/walkdir/Cargo.toml | 3 -- + vendor/yansi-term/Cargo.toml | 3 -- + 57 files changed, 1 insertion(+), 487 deletions(-) -diff --git a/vendor/android-tzdata/Cargo.toml b/vendor/android-tzdata/Cargo.toml -index 805128a..0682717 100644 ---- a/vendor/android-tzdata/Cargo.toml -+++ b/vendor/android-tzdata/Cargo.toml -@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/android-tzdata" +Index: rust/vendor/android-tzdata/Cargo.toml +=================================================================== +--- rust.orig/vendor/android-tzdata/Cargo.toml ++++ rust/vendor/android-tzdata/Cargo.toml +@@ -32,3 +32,4 @@ repository = "https://github.com/RumovZ/ [dev-dependencies.zip] version = "0.6.4" +repository = "https://github.com/rust-cli/concolor" -diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml -index 75d78e2..a0eddb4 100644 ---- a/vendor/anstream/Cargo.toml -+++ b/vendor/anstream/Cargo.toml +Index: rust/vendor/anstream/Cargo.toml +=================================================================== +--- rust.orig/vendor/anstream/Cargo.toml ++++ rust/vendor/anstream/Cargo.toml @@ -136,10 +136,4 @@ auto = [ ] default = [ @@ -81,10 +90,10 @@ index 75d78e2..a0eddb4 100644 -[target."cfg(windows)".dependencies.anstyle-wincon] -version = "1.0.1" -optional = true -diff --git a/vendor/anstyle-query/Cargo.toml b/vendor/anstyle-query/Cargo.toml -index 63a431c..0cf859b 100644 ---- a/vendor/anstyle-query/Cargo.toml -+++ b/vendor/anstyle-query/Cargo.toml +Index: rust/vendor/anstyle-query/Cargo.toml +=================================================================== +--- rust.orig/vendor/anstyle-query/Cargo.toml ++++ rust/vendor/anstyle-query/Cargo.toml @@ -70,10 +70,3 @@ replace = """ [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD""" @@ -96,10 +105,10 @@ index 63a431c..0cf859b 100644 - "Win32_System_Console", - "Win32_Foundation", -] -diff --git a/vendor/atty/Cargo.toml b/vendor/atty/Cargo.toml -index d6bf2d0..7cebc31 100644 ---- a/vendor/atty/Cargo.toml -+++ b/vendor/atty/Cargo.toml +Index: rust/vendor/atty/Cargo.toml +=================================================================== +--- rust.orig/vendor/atty/Cargo.toml ++++ rust/vendor/atty/Cargo.toml @@ -27,8 +27,5 @@ version = "0.1.6" [target."cfg(unix)".dependencies.libc] version = "0.2" @@ -109,10 +118,10 @@ index d6bf2d0..7cebc31 100644 -features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"] [badges.travis-ci] repository = "softprops/atty" -diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml -index f33884a..b43a0dd 100644 ---- a/vendor/backtrace/Cargo.toml -+++ b/vendor/backtrace/Cargo.toml +Index: rust/vendor/backtrace/Cargo.toml +=================================================================== +--- rust.orig/vendor/backtrace/Cargo.toml ++++ rust/vendor/backtrace/Cargo.toml @@ -127,18 +127,5 @@ serialize-serde = ["serde"] std = [] unix-backtrace = [] @@ -132,10 +141,10 @@ index f33884a..b43a0dd 100644 -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" -optional = true -diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml -index 7f49bad..6229f0a 100644 ---- a/vendor/chrono/Cargo.toml -+++ b/vendor/chrono/Cargo.toml +Index: rust/vendor/chrono/Cargo.toml +=================================================================== +--- rust.orig/vendor/chrono/Cargo.toml ++++ rust/vendor/chrono/Cargo.toml @@ -107,7 +107,6 @@ __internal_bench = ["criterion"] alloc = [] clock = [ @@ -159,10 +168,10 @@ index 7f49bad..6229f0a 100644 - "sysinfoapi", -] -optional = true -diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml -index 3a6b59b..065eecb 100644 ---- a/vendor/colored/Cargo.toml -+++ b/vendor/colored/Cargo.toml +Index: rust/vendor/colored/Cargo.toml +=================================================================== +--- rust.orig/vendor/colored/Cargo.toml ++++ rust/vendor/colored/Cargo.toml @@ -33,7 +33,3 @@ version = "=1.0.0-beta.3" [features] @@ -171,12 +180,12 @@ index 3a6b59b..065eecb 100644 -version = "0.3" -features = ["consoleapi", "processenv", "winbase"] -default-features = false -diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml -index 6d89163..0b17324 100644 ---- a/vendor/curl-sys/Cargo.toml -+++ b/vendor/curl-sys/Cargo.toml +Index: rust/vendor/curl-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/curl-sys/Cargo.toml ++++ rust/vendor/curl-sys/Cargo.toml @@ -73,16 +73,6 @@ zlib-ng-compat = [ - version = "0.9" + version = "0.9.64" optional = true -[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] @@ -192,10 +201,10 @@ index 6d89163..0b17324 100644 [badges.appveyor] repository = "alexcrichton/curl-rust" -diff --git a/vendor/curl/Cargo.toml b/vendor/curl/Cargo.toml -index bfb59f4..d9f6854 100644 ---- a/vendor/curl/Cargo.toml -+++ b/vendor/curl/Cargo.toml +Index: rust/vendor/curl/Cargo.toml +=================================================================== +--- rust.orig/vendor/curl/Cargo.toml ++++ rust/vendor/curl/Cargo.toml @@ -107,16 +107,6 @@ optional = true version = "0.9.43" optional = true @@ -213,10 +222,10 @@ index bfb59f4..d9f6854 100644 [badges.appveyor] repository = "alexcrichton/curl-rust" -diff --git a/vendor/dirs-sys-next/Cargo.toml b/vendor/dirs-sys-next/Cargo.toml -index e9d8d0c..acb2eb7 100644 ---- a/vendor/dirs-sys-next/Cargo.toml -+++ b/vendor/dirs-sys-next/Cargo.toml +Index: rust/vendor/dirs-sys-next/Cargo.toml +=================================================================== +--- rust.orig/vendor/dirs-sys-next/Cargo.toml ++++ rust/vendor/dirs-sys-next/Cargo.toml @@ -25,8 +25,5 @@ version = "0.4.0" default-features = false [target."cfg(unix)".dependencies.libc] @@ -226,10 +235,10 @@ index e9d8d0c..acb2eb7 100644 -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] [badges.maintenance] status = "as-is" -diff --git a/vendor/dirs-sys/Cargo.toml b/vendor/dirs-sys/Cargo.toml -index 9951d24..0a86f4d 100644 ---- a/vendor/dirs-sys/Cargo.toml -+++ b/vendor/dirs-sys/Cargo.toml +Index: rust/vendor/dirs-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/dirs-sys/Cargo.toml ++++ rust/vendor/dirs-sys/Cargo.toml @@ -22,6 +22,3 @@ version = "0.4" default-features = false [target."cfg(unix)".dependencies.libc] @@ -237,10 +246,10 @@ index 9951d24..0a86f4d 100644 -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] -diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml -index bf54b1f..7507a31 100644 ---- a/vendor/errno/Cargo.toml -+++ b/vendor/errno/Cargo.toml +Index: rust/vendor/errno/Cargo.toml +=================================================================== +--- rust.orig/vendor/errno/Cargo.toml ++++ rust/vendor/errno/Cargo.toml @@ -41,9 +41,3 @@ version = "0.2" [target."cfg(unix)".dependencies.libc] version = "0.2" @@ -251,10 +260,10 @@ index bf54b1f..7507a31 100644 - "Win32_Foundation", - "Win32_System_Diagnostics_Debug", -] -diff --git a/vendor/fd-lock/Cargo.toml b/vendor/fd-lock/Cargo.toml -index d995177..b759d87 100644 ---- a/vendor/fd-lock/Cargo.toml -+++ b/vendor/fd-lock/Cargo.toml +Index: rust/vendor/fd-lock/Cargo.toml +=================================================================== +--- rust.orig/vendor/fd-lock/Cargo.toml ++++ rust/vendor/fd-lock/Cargo.toml @@ -43,11 +43,3 @@ version = "3.0.8" [target."cfg(unix)".dependencies.rustix] version = "0.37.0" @@ -267,10 +276,10 @@ index d995177..b759d87 100644 - "Win32_Storage_FileSystem", - "Win32_System_IO", -] -diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml -index 8547ec3..4ecd973 100644 ---- a/vendor/filetime/Cargo.toml -+++ b/vendor/filetime/Cargo.toml +Index: rust/vendor/filetime/Cargo.toml +=================================================================== +--- rust.orig/vendor/filetime/Cargo.toml ++++ rust/vendor/filetime/Cargo.toml @@ -38,10 +38,3 @@ version = "0.2.9" [target."cfg(unix)".dependencies.libc] @@ -282,10 +291,10 @@ index 8547ec3..4ecd973 100644 - "Win32_Foundation", - "Win32_Storage_FileSystem", -] -diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml -index 254f82f..65248eb 100644 ---- a/vendor/gix-sec/Cargo.toml -+++ b/vendor/gix-sec/Cargo.toml +Index: rust/vendor/gix-sec/Cargo.toml +=================================================================== +--- rust.orig/vendor/gix-sec/Cargo.toml ++++ rust/vendor/gix-sec/Cargo.toml @@ -63,15 +63,3 @@ serde = [ [target."cfg(not(windows))".dependencies.libc] version = "0.2.123" @@ -302,10 +311,10 @@ index 254f82f..65248eb 100644 - "Win32_System_Memory", - "Win32_System_Threading", -] -diff --git a/vendor/home/Cargo.toml b/vendor/home/Cargo.toml -index cd608b1..eecfb89 100644 ---- a/vendor/home/Cargo.toml -+++ b/vendor/home/Cargo.toml +Index: rust/vendor/home/Cargo.toml +=================================================================== +--- rust.orig/vendor/home/Cargo.toml ++++ rust/vendor/home/Cargo.toml @@ -27,10 +27,3 @@ readme = "README.md" license = "MIT OR Apache-2.0" repository = "https://github.com/rust-lang/cargo" @@ -317,10 +326,10 @@ index cd608b1..eecfb89 100644 - "Win32_Foundation", - "Win32_UI_Shell", -] -diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml -index e06c705..572a8fd 100644 ---- a/vendor/iana-time-zone/Cargo.toml -+++ b/vendor/iana-time-zone/Cargo.toml +Index: rust/vendor/iana-time-zone/Cargo.toml +=================================================================== +--- rust.orig/vendor/iana-time-zone/Cargo.toml ++++ rust/vendor/iana-time-zone/Cargo.toml @@ -52,7 +52,3 @@ version = "0.1.5" [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku] @@ -329,10 +338,10 @@ index e06c705..572a8fd 100644 -[target."cfg(target_os = \"windows\")".dependencies.windows] -version = "0.48.0" -features = ["Globalization"] -diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml -index b397dcf..2022a87 100644 ---- a/vendor/ignore/Cargo.toml -+++ b/vendor/ignore/Cargo.toml +Index: rust/vendor/ignore/Cargo.toml +=================================================================== +--- rust.orig/vendor/ignore/Cargo.toml ++++ rust/vendor/ignore/Cargo.toml @@ -64,6 +64,3 @@ version = "0.5.0" [features] @@ -340,10 +349,10 @@ index b397dcf..2022a87 100644 - -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.2" -diff --git a/vendor/io-close/Cargo.toml b/vendor/io-close/Cargo.toml -index 5e36444..82f9ce5 100644 ---- a/vendor/io-close/Cargo.toml -+++ b/vendor/io-close/Cargo.toml +Index: rust/vendor/io-close/Cargo.toml +=================================================================== +--- rust.orig/vendor/io-close/Cargo.toml ++++ rust/vendor/io-close/Cargo.toml @@ -28,6 +28,3 @@ optional = true version = "3.1.0" [target."cfg(unix)".dependencies.libc] @@ -351,10 +360,10 @@ index 5e36444..82f9ce5 100644 -[target."cfg(windows)".dependencies.winapi] -version = "0.3.9" -features = ["handleapi", "std", "winsock2"] -diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml -index ef92ff0..c2733fb 100644 ---- a/vendor/io-lifetimes/Cargo.toml -+++ b/vendor/io-lifetimes/Cargo.toml +Index: rust/vendor/io-lifetimes/Cargo.toml +=================================================================== +--- rust.orig/vendor/io-lifetimes/Cargo.toml ++++ rust/vendor/io-lifetimes/Cargo.toml @@ -43,7 +43,6 @@ optional = true close = [ "libc", @@ -379,10 +388,10 @@ index ef92ff0..c2733fb 100644 - "Win32_System_Threading", -] -optional = true -diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml -index e0baea0..7790abd 100644 ---- a/vendor/is-terminal/Cargo.toml -+++ b/vendor/is-terminal/Cargo.toml +Index: rust/vendor/is-terminal/Cargo.toml +=================================================================== +--- rust.orig/vendor/is-terminal/Cargo.toml ++++ rust/vendor/is-terminal/Cargo.toml @@ -54,14 +54,3 @@ features = ["stdio"] [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi] @@ -398,26 +407,41 @@ index e0baea0..7790abd 100644 - -[target."cfg(windows)".dev-dependencies.tempfile] -version = "3" -diff --git a/vendor/libloading/Cargo.toml b/vendor/libloading/Cargo.toml -index 65168d5..7785a7e 100644 ---- a/vendor/libloading/Cargo.toml -+++ b/vendor/libloading/Cargo.toml -@@ -42,10 +42,3 @@ version = "1.1" - +Index: rust/vendor/libloading-0.7.4/Cargo.toml +=================================================================== +--- rust.orig/vendor/libloading-0.7.4/Cargo.toml ++++ rust/vendor/libloading-0.7.4/Cargo.toml +@@ -43,9 +43,3 @@ version = "1.1" [target."cfg(unix)".dependencies.cfg-if] version = "1" -- + -[target."cfg(windows)".dependencies.winapi] -version = "0.3" -features = [ - "errhandlingapi", - "libloaderapi", -] -diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml -index 45f4a71..f791ce9 100644 ---- a/vendor/libssh2-sys/Cargo.toml -+++ b/vendor/libssh2-sys/Cargo.toml -@@ -43,7 +43,6 @@ version = "1.0.25" +Index: rust/vendor/libloading/Cargo.toml +=================================================================== +--- rust.orig/vendor/libloading/Cargo.toml ++++ rust/vendor/libloading/Cargo.toml +@@ -42,11 +42,3 @@ version = "1.1" + + [target."cfg(unix)".dependencies.cfg-if] + version = "1" +- +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_System_Diagnostics_Debug", +- "Win32_System_LibraryLoader", +-] +Index: rust/vendor/libssh2-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/libssh2-sys/Cargo.toml ++++ rust/vendor/libssh2-sys/Cargo.toml +@@ -43,16 +43,8 @@ version = "1.0.25" version = "0.3.11" [features] @@ -425,18 +449,67 @@ index 45f4a71..f791ce9 100644 vendored-openssl = ["openssl-sys/vendored"] zlib-ng-compat = ["libz-sys/zlib-ng"] -@@ -52,7 +51,3 @@ version = "0.2" - +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +- [target."cfg(unix)".dependencies.openssl-sys] version = "0.9.35" - -[target."cfg(windows)".dependencies.openssl-sys] -version = "0.9.35" -optional = true -diff --git a/vendor/nu-ansi-term/Cargo.toml b/vendor/nu-ansi-term/Cargo.toml -index 209e055..aa40f02 100644 ---- a/vendor/nu-ansi-term/Cargo.toml -+++ b/vendor/nu-ansi-term/Cargo.toml +Index: rust/vendor/libz-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/libz-sys/Cargo.toml ++++ rust/vendor/libz-sys/Cargo.toml +@@ -65,6 +65,3 @@ zlib-ng = [ + "libc", + "cmake", + ] +- +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2" +Index: rust/vendor/mio/Cargo.toml +=================================================================== +--- rust.orig/vendor/mio/Cargo.toml ++++ rust/vendor/mio/Cargo.toml +@@ -102,8 +102,6 @@ default = ["log"] + net = [] + os-ext = [ + "os-poll", +- "windows-sys/Win32_System_Pipes", +- "windows-sys/Win32_Security", + ] + os-poll = [] + +@@ -116,12 +114,3 @@ version = "0.11.0" + [target."cfg(unix)".dependencies.libc] + version = "0.2.121" + +-[target."cfg(windows)".dependencies.windows-sys] +-version = "0.48" +-features = [ +- "Win32_Foundation", +- "Win32_Networking_WinSock", +- "Win32_Storage_FileSystem", +- "Win32_System_IO", +- "Win32_System_WindowsProgramming", +-] +Index: rust/vendor/native-tls/Cargo.toml +=================================================================== +--- rust.orig/vendor/native-tls/Cargo.toml ++++ rust/vendor/native-tls/Cargo.toml +@@ -61,6 +61,3 @@ version = "0.1" + + [target."cfg(not(any(target_os = \"windows\", target_os = \"macos\", target_os = \"ios\")))".dependencies.openssl-sys] + version = "0.9.55" +- +-[target."cfg(target_os = \"windows\")".dependencies.schannel] +-version = "0.1.17" +Index: rust/vendor/nu-ansi-term/Cargo.toml +=================================================================== +--- rust.orig/vendor/nu-ansi-term/Cargo.toml ++++ rust/vendor/nu-ansi-term/Cargo.toml @@ -45,13 +45,3 @@ version = "1.0.39" [features] @@ -451,10 +524,10 @@ index 209e055..aa40f02 100644 - "handleapi", - "processenv", -] -diff --git a/vendor/opener/Cargo.toml b/vendor/opener/Cargo.toml -index 8d91b5e..2d7313b 100644 ---- a/vendor/opener/Cargo.toml -+++ b/vendor/opener/Cargo.toml +Index: rust/vendor/opener-0.5.2/Cargo.toml +=================================================================== +--- rust.orig/vendor/opener-0.5.2/Cargo.toml ++++ rust/vendor/opener-0.5.2/Cargo.toml @@ -32,10 +32,6 @@ version = "0.9" [target."cfg(target_os = \"linux\")".dependencies.bstr] version = "1" @@ -466,10 +539,48 @@ index 8d91b5e..2d7313b 100644 [badges.appveyor] branch = "master" repository = "Seeker14491/opener" -diff --git a/vendor/os_info/Cargo.toml b/vendor/os_info/Cargo.toml -index 52a062f..e1f347b 100644 ---- a/vendor/os_info/Cargo.toml -+++ b/vendor/os_info/Cargo.toml +Index: rust/vendor/opener/Cargo.toml +=================================================================== +--- rust.orig/vendor/opener/Cargo.toml ++++ rust/vendor/opener/Cargo.toml +@@ -40,8 +40,6 @@ version = "0.9" + reveal = [ + "dep:url", + "dep:dbus", +- "winapi/shtypes", +- "winapi/objbase", + ] + + [target."cfg(target_os = \"linux\")".dependencies.bstr] +@@ -56,13 +54,6 @@ optional = true + version = "2" + optional = true + +-[target."cfg(windows)".dependencies.normpath] +-version = "1" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3" +-features = ["shellapi"] +- + [badges.appveyor] + branch = "master" + repository = "Seeker14491/opener" +Index: rust/vendor/openssl-sys/Cargo.toml +=================================================================== +--- rust.orig/vendor/openssl-sys/Cargo.toml ++++ rust/vendor/openssl-sys/Cargo.toml +@@ -56,6 +56,3 @@ version = "0.3.9" + [features] + unstable_boringssl = ["bssl-sys"] + vendored = ["openssl-src"] +- +-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg] +-version = "0.2.8" +Index: rust/vendor/os_info/Cargo.toml +=================================================================== +--- rust.orig/vendor/os_info/Cargo.toml ++++ rust/vendor/os_info/Cargo.toml @@ -48,18 +48,3 @@ version = "1" [features] @@ -489,10 +600,10 @@ index 52a062f..e1f347b 100644 - "winerror", - "winreg", -] -diff --git a/vendor/parking_lot_core-0.8.6/Cargo.toml b/vendor/parking_lot_core-0.8.6/Cargo.toml -index 6981516..9fb8bd2 100644 ---- a/vendor/parking_lot_core-0.8.6/Cargo.toml -+++ b/vendor/parking_lot_core-0.8.6/Cargo.toml +Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml +=================================================================== +--- rust.orig/vendor/parking_lot_core-0.8.6/Cargo.toml ++++ rust/vendor/parking_lot_core-0.8.6/Cargo.toml @@ -60,15 +60,3 @@ version = "0.2.8" [target."cfg(unix)".dependencies.libc] @@ -509,10 +620,10 @@ index 6981516..9fb8bd2 100644 - "errhandlingapi", - "handleapi", -] -diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml -index d76740d..7da23fc 100644 ---- a/vendor/parking_lot_core/Cargo.toml -+++ b/vendor/parking_lot_core/Cargo.toml +Index: rust/vendor/parking_lot_core/Cargo.toml +=================================================================== +--- rust.orig/vendor/parking_lot_core/Cargo.toml ++++ rust/vendor/parking_lot_core/Cargo.toml @@ -57,6 +57,3 @@ version = "0.3" [target."cfg(unix)".dependencies.libc] @@ -520,44 +631,22 @@ index d76740d..7da23fc 100644 - -[target."cfg(windows)".dependencies.windows-targets] -version = "0.48.0" -diff --git a/vendor/pretty_assertions/Cargo.toml b/vendor/pretty_assertions/Cargo.toml -index f8370f7..4531652 100644 ---- a/vendor/pretty_assertions/Cargo.toml -+++ b/vendor/pretty_assertions/Cargo.toml -@@ -42,9 +42,3 @@ alloc = [] - default = ["std"] - std = [] - unstable = [] -- --[target."cfg(windows)".dependencies.ctor] --version = "0.1.9" -- --[target."cfg(windows)".dependencies.output_vt100] --version = "0.1.2" -diff --git a/vendor/rustix-0.37.11/Cargo.toml b/vendor/rustix-0.37.11/Cargo.toml -index a0ea91d..e5d57b1 100644 ---- a/vendor/rustix-0.37.11/Cargo.toml -+++ b/vendor/rustix-0.37.11/Cargo.toml -@@ -234,14 +234,3 @@ package = "errno" - version = "1.5.2" - optional = true +Index: rust/vendor/reqwest/Cargo.toml +=================================================================== +--- rust.orig/vendor/reqwest/Cargo.toml ++++ rust/vendor/reqwest/Cargo.toml +@@ -443,6 +443,3 @@ features = ["serde-serialize"] --[target."cfg(windows)".dependencies.windows-sys] --version = "0.48.0" --features = [ -- "Win32_Foundation", -- "Win32_Networking_WinSock", -- "Win32_NetworkManagement_IpHelper", -- "Win32_System_Threading", --] + [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test] + version = "0.3" - --[target."cfg(windows)".dev-dependencies.ctor] --version = "0.2.0" -diff --git a/vendor/rustix-0.37.20/Cargo.toml b/vendor/rustix-0.37.20/Cargo.toml -index 1a23dff..666da7b 100644 ---- a/vendor/rustix-0.37.20/Cargo.toml -+++ b/vendor/rustix-0.37.20/Cargo.toml -@@ -240,19 +240,3 @@ package = "errno" +-[target."cfg(windows)".dependencies.winreg] +-version = "0.10" +Index: rust/vendor/rustix-0.37.22/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix-0.37.22/Cargo.toml ++++ rust/vendor/rustix-0.37.22/Cargo.toml +@@ -239,19 +239,3 @@ package = "errno" version = "1.5.2" optional = true @@ -577,11 +666,11 @@ index 1a23dff..666da7b 100644 - -[target."cfg(windows)".dev-dependencies.ctor] -version = "0.2.0" -diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml -index dd40b25..95b35ba 100644 ---- a/vendor/rustix/Cargo.toml -+++ b/vendor/rustix/Cargo.toml -@@ -235,20 +235,3 @@ package = "errno" +Index: rust/vendor/rustix/Cargo.toml +=================================================================== +--- rust.orig/vendor/rustix/Cargo.toml ++++ rust/vendor/rustix/Cargo.toml +@@ -238,20 +238,3 @@ package = "errno" [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell] version = "1.5.2" optional = true @@ -602,20 +691,20 @@ index dd40b25..95b35ba 100644 - -[target."cfg(windows)".dev-dependencies.ctor] -version = "0.2.0" -diff --git a/vendor/same-file/Cargo.toml b/vendor/same-file/Cargo.toml -index 4f66820..11ef472 100644 ---- a/vendor/same-file/Cargo.toml -+++ b/vendor/same-file/Cargo.toml +Index: rust/vendor/same-file/Cargo.toml +=================================================================== +--- rust.orig/vendor/same-file/Cargo.toml ++++ rust/vendor/same-file/Cargo.toml @@ -25,5 +25,3 @@ license = "Unlicense/MIT" repository = "https://github.com/BurntSushi/same-file" [dev-dependencies.doc-comment] version = "0.3" -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.1" -diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml -index 5ca8579..8f438dd 100644 ---- a/vendor/snapbox/Cargo.toml -+++ b/vendor/snapbox/Cargo.toml +Index: rust/vendor/snapbox/Cargo.toml +=================================================================== +--- rust.orig/vendor/snapbox/Cargo.toml ++++ rust/vendor/snapbox/Cargo.toml @@ -161,7 +161,6 @@ cmd = [ "dep:os_pipe", "dep:wait-timeout", @@ -633,10 +722,10 @@ index 5ca8579..8f438dd 100644 -version = "0.45.0" -features = ["Win32_Foundation"] -optional = true -diff --git a/vendor/socket2/Cargo.toml b/vendor/socket2/Cargo.toml -index 3f1578c..bdac898 100644 ---- a/vendor/socket2/Cargo.toml -+++ b/vendor/socket2/Cargo.toml +Index: rust/vendor/socket2/Cargo.toml +=================================================================== +--- rust.orig/vendor/socket2/Cargo.toml ++++ rust/vendor/socket2/Cargo.toml @@ -58,11 +58,3 @@ all = [] [target."cfg(unix)".dependencies.libc] @@ -649,10 +738,10 @@ index 3f1578c..bdac898 100644 - "ws2ipdef", - "ws2tcpip", -] -diff --git a/vendor/stacker/Cargo.toml b/vendor/stacker/Cargo.toml -index 160cbc0..ba02aac 100644 ---- a/vendor/stacker/Cargo.toml -+++ b/vendor/stacker/Cargo.toml +Index: rust/vendor/stacker/Cargo.toml +=================================================================== +--- rust.orig/vendor/stacker/Cargo.toml ++++ rust/vendor/stacker/Cargo.toml @@ -43,13 +43,3 @@ version = "0.1.7" [build-dependencies.cc] @@ -667,10 +756,10 @@ index 160cbc0..ba02aac 100644 - "processthreadsapi", - "minwindef", -] -diff --git a/vendor/sysinfo/Cargo.toml b/vendor/sysinfo/Cargo.toml -index f8719a4..deb2e40 100644 ---- a/vendor/sysinfo/Cargo.toml -+++ b/vendor/sysinfo/Cargo.toml +Index: rust/vendor/sysinfo-0.26.7/Cargo.toml +=================================================================== +--- rust.orig/vendor/sysinfo-0.26.7/Cargo.toml ++++ rust/vendor/sysinfo-0.26.7/Cargo.toml @@ -60,41 +60,3 @@ version = "1.0" [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] @@ -713,11 +802,60 @@ index f8719a4..deb2e40 100644 - "shellapi", - "std", -] -diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml -index 1af1206..f665e00 100644 ---- a/vendor/tempfile/Cargo.toml -+++ b/vendor/tempfile/Cargo.toml -@@ -53,10 +53,3 @@ features = ["fs"] +Index: rust/vendor/sysinfo/Cargo.toml +=================================================================== +--- rust.orig/vendor/sysinfo/Cargo.toml ++++ rust/vendor/sysinfo/Cargo.toml +@@ -75,44 +75,3 @@ version = "1.0" + + [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc] + version = "^0.2.144" +- +-[target."cfg(windows)".dependencies.ntapi] +-version = "0.4" +- +-[target."cfg(windows)".dependencies.winapi] +-version = "0.3.9" +-features = [ +- "errhandlingapi", +- "fileapi", +- "handleapi", +- "heapapi", +- "ifdef", +- "ioapiset", +- "minwindef", +- "pdh", +- "psapi", +- "synchapi", +- "sysinfoapi", +- "winbase", +- "winerror", +- "winioctl", +- "winnt", +- "oleauto", +- "wbemcli", +- "rpcdce", +- "combaseapi", +- "objidl", +- "powerbase", +- "netioapi", +- "lmcons", +- "lmaccess", +- "lmapibuf", +- "memoryapi", +- "ntlsa", +- "securitybaseapi", +- "shellapi", +- "std", +- "iphlpapi", +- "winsock2", +- "sddl", +-] +Index: rust/vendor/tempfile/Cargo.toml +=================================================================== +--- rust.orig/vendor/tempfile/Cargo.toml ++++ rust/vendor/tempfile/Cargo.toml +@@ -50,10 +50,3 @@ features = ["fs"] [target."cfg(target_os = \"redox\")".dependencies.redox_syscall] version = "0.3" @@ -728,10 +866,10 @@ index 1af1206..f665e00 100644 - "Win32_Storage_FileSystem", - "Win32_Foundation", -] -diff --git a/vendor/term/Cargo.toml b/vendor/term/Cargo.toml -index e89261e..ad5d62b 100644 ---- a/vendor/term/Cargo.toml -+++ b/vendor/term/Cargo.toml +Index: rust/vendor/term/Cargo.toml +=================================================================== +--- rust.orig/vendor/term/Cargo.toml ++++ rust/vendor/term/Cargo.toml @@ -28,12 +28,6 @@ version = "2" [features] @@ -745,10 +883,10 @@ index e89261e..ad5d62b 100644 [badges.appveyor] repository = "Stebalien/term" -diff --git a/vendor/termcolor/Cargo.toml b/vendor/termcolor/Cargo.toml -index dbdb6e8..8edc73e 100644 ---- a/vendor/termcolor/Cargo.toml -+++ b/vendor/termcolor/Cargo.toml +Index: rust/vendor/termcolor/Cargo.toml +=================================================================== +--- rust.orig/vendor/termcolor/Cargo.toml ++++ rust/vendor/termcolor/Cargo.toml @@ -35,6 +35,3 @@ name = "termcolor" bench = false @@ -756,11 +894,11 @@ index dbdb6e8..8edc73e 100644 - -[target."cfg(windows)".dependencies.winapi-util] -version = "0.1.3" -diff --git a/vendor/terminal_size/Cargo.toml b/vendor/terminal_size/Cargo.toml -index 9f31164..6d2d6a5 100644 ---- a/vendor/terminal_size/Cargo.toml -+++ b/vendor/terminal_size/Cargo.toml -@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size" +Index: rust/vendor/terminal_size/Cargo.toml +=================================================================== +--- rust.orig/vendor/terminal_size/Cargo.toml ++++ rust/vendor/terminal_size/Cargo.toml +@@ -30,10 +30,3 @@ repository = "https://github.com/eminenc [target."cfg(not(windows))".dependencies.rustix] version = "0.37.0" features = ["termios"] @@ -771,10 +909,10 @@ index 9f31164..6d2d6a5 100644 - "Win32_Foundation", - "Win32_System_Console", -] -diff --git a/vendor/termize/Cargo.toml b/vendor/termize/Cargo.toml -index d248f4d..9bd9f37 100644 ---- a/vendor/termize/Cargo.toml -+++ b/vendor/termize/Cargo.toml +Index: rust/vendor/termize/Cargo.toml +=================================================================== +--- rust.orig/vendor/termize/Cargo.toml ++++ rust/vendor/termize/Cargo.toml @@ -49,8 +49,5 @@ rpath = false [dependencies] [target."cfg(unix)".dependencies.libc] @@ -784,10 +922,10 @@ index d248f4d..9bd9f37 100644 -features = ["handleapi", "processenv", "wincon", "winbase"] [badges.cirrus-ci] repository = "JohnTitor/termize" -diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml -index da1e4d1..55afa86 100644 ---- a/vendor/tokio/Cargo.toml -+++ b/vendor/tokio/Cargo.toml +Index: rust/vendor/tokio/Cargo.toml +=================================================================== +--- rust.orig/vendor/tokio/Cargo.toml ++++ rust/vendor/tokio/Cargo.toml @@ -122,11 +122,6 @@ net = [ "mio/os-ext", "mio/net", @@ -834,10 +972,10 @@ index da1e4d1..55afa86 100644 - "Win32_Foundation", - "Win32_Security_Authorization", -] -diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml -index b806036..4094678 100644 ---- a/vendor/uuid/Cargo.toml -+++ b/vendor/uuid/Cargo.toml +Index: rust/vendor/uuid/Cargo.toml +=================================================================== +--- rust.orig/vendor/uuid/Cargo.toml ++++ rust/vendor/uuid/Cargo.toml @@ -185,10 +185,6 @@ version = "0.3" version = "0.2" package = "wasm-bindgen" @@ -849,10 +987,10 @@ index b806036..4094678 100644 [badges.is-it-maintained-issue-resolution] repository = "uuid-rs/uuid" -diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml -index 7db9263..2a9b56f 100644 ---- a/vendor/walkdir/Cargo.toml -+++ b/vendor/walkdir/Cargo.toml +Index: rust/vendor/walkdir/Cargo.toml +=================================================================== +--- rust.orig/vendor/walkdir/Cargo.toml ++++ rust/vendor/walkdir/Cargo.toml @@ -39,9 +39,6 @@ version = "1.0.1" [dev-dependencies.doc-comment] version = "0.3" @@ -863,10 +1001,10 @@ index 7db9263..2a9b56f 100644 [badges.appveyor] repository = "BurntSushi/walkdir" -diff --git a/vendor/yansi-term/Cargo.toml b/vendor/yansi-term/Cargo.toml -index 0317866..88ce8ef 100644 ---- a/vendor/yansi-term/Cargo.toml -+++ b/vendor/yansi-term/Cargo.toml +Index: rust/vendor/yansi-term/Cargo.toml +=================================================================== +--- rust.orig/vendor/yansi-term/Cargo.toml ++++ rust/vendor/yansi-term/Cargo.toml @@ -36,9 +36,6 @@ version = "1.0" [features] diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch index dadecf9d0..906f341ad 100644 --- a/debian/patches/d-bootstrap-cargo-doc-paths.patch +++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch @@ -75,10 +75,10 @@ Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md +[4]: ../../../../cargo/book/reference/resolver.html#feature-resolver-version-2 [5]: https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver -[workspace]: ../../cargo/reference/workspaces.html --[virtual workspace]: ../../cargo/reference/workspaces.html#virtual-manifest +-[virtual workspace]: ../../cargo/reference/workspaces.html#virtual-workspace -[`resolver` field]: ../../cargo/reference/resolver.html#resolver-versions +[workspace]: ../../../../cargo/book/reference/workspaces.html -+[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-manifest ++[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-workspace +[`resolver` field]: ../../../../cargo/book/reference/resolver.html#resolver-versions ## Migration diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch index e989666a1..39f246be1 100644 --- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch +++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch @@ -12,12 +12,12 @@ Index: rust/src/bootstrap/lib.rs =================================================================== --- rust.orig/src/bootstrap/lib.rs +++ rust/src/bootstrap/lib.rs -@@ -1110,10 +1110,9 @@ impl Build { +@@ -1145,10 +1145,9 @@ impl Build { match which { GitRepo::Rustc => { - let sha = self.rust_sha().unwrap_or(&self.version); -- Some(format!("/rustc/{}", sha)) +- Some(format!("/rustc/{sha}")) + Some(format!("/usr/src/rustc-{}", &self.version)) } - GitRepo::Llvm => Some(String::from("/rustc/llvm")), diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch index 3431ebfff..059a52078 100644 --- a/debian/patches/d-fix-rustix-outline.patch +++ b/debian/patches/d-fix-rustix-outline.patch @@ -3,16 +3,16 @@ Always enable cc even if the feature is not enabled. Some Debian architectures need outline asm, and Debian does not ship pre-built outline asm. -Index: rust/vendor/rustix/build.rs +Index: rust/vendor/rustix-0.37.22/build.rs =================================================================== ---- rust.orig/vendor/rustix/build.rs -+++ rust/vendor/rustix/build.rs +--- rust.orig/vendor/rustix-0.37.22/build.rs ++++ rust/vendor/rustix-0.37.22/build.rs @@ -1,4 +1,3 @@ -#[cfg(feature = "cc")] use cc::Build; use std::env::var; use std::io::Write; -@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, +@@ -169,16 +168,16 @@ fn link_in_librustix_outline(arch: &str, println!("cargo:rerun-if-changed={}", to); // If "cc" is not enabled, use a pre-built library. @@ -32,93 +32,11 @@ Index: rust/vendor/rustix/build.rs { let out_dir = var("OUT_DIR").unwrap(); // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix/Cargo.toml +Index: rust/vendor/rustix-0.37.22/Cargo.toml =================================================================== ---- rust.orig/vendor/rustix/Cargo.toml -+++ rust/vendor/rustix/Cargo.toml -@@ -117,7 +117,6 @@ version = "3.5.0" - - [build-dependencies.cc] - version = "1.0.68" --optional = true - - [features] - all-apis = [ -Index: rust/vendor/rustix-0.37.11/build.rs -=================================================================== ---- rust.orig/vendor/rustix-0.37.11/build.rs -+++ rust/vendor/rustix-0.37.11/build.rs -@@ -1,4 +1,3 @@ --#[cfg(feature = "cc")] - use cc::Build; - use std::env::var; - use std::io::Write; -@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, - println!("cargo:rerun-if-changed={}", to); - - // If "cc" is not enabled, use a pre-built library. -- #[cfg(not(feature = "cc"))] -+ /*#[cfg(not(feature = "cc"))] - { - let _ = asm_name; - println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile); - println!("cargo:rustc-link-lib=static={}", name); -- } -+ }*/ - - // If "cc" is enabled, build the library from source, update the pre-built - // version, and assert that the pre-built version is checked in. -- #[cfg(feature = "cc")] -+ //#[cfg(feature = "cc")] - { - let out_dir = var("OUT_DIR").unwrap(); - // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix-0.37.11/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.37.11/Cargo.toml -+++ rust/vendor/rustix-0.37.11/Cargo.toml -@@ -117,7 +117,6 @@ version = "3.5.0" - - [build-dependencies.cc] - version = "1.0.68" --optional = true - - [features] - all-apis = [ -Index: rust/vendor/rustix-0.37.20/build.rs -=================================================================== ---- rust.orig/vendor/rustix-0.37.20/build.rs -+++ rust/vendor/rustix-0.37.20/build.rs -@@ -1,4 +1,3 @@ --#[cfg(feature = "cc")] - use cc::Build; - use std::env::var; - use std::io::Write; -@@ -165,16 +164,16 @@ fn link_in_librustix_outline(arch: &str, - println!("cargo:rerun-if-changed={}", to); - - // If "cc" is not enabled, use a pre-built library. -- #[cfg(not(feature = "cc"))] -+ /*#[cfg(not(feature = "cc"))] - { - let _ = asm_name; - println!("cargo:rustc-link-search={}/{}", OUTLINE_PATH, profile); - println!("cargo:rustc-link-lib=static={}", name); -- } -+ }*/ - - // If "cc" is enabled, build the library from source, update the pre-built - // version, and assert that the pre-built version is checked in. -- #[cfg(feature = "cc")] -+ //#[cfg(feature = "cc")] - { - let out_dir = var("OUT_DIR").unwrap(); - // Add `-gdwarf-3` so that we always get the same output, regardless of -Index: rust/vendor/rustix-0.37.20/Cargo.toml -=================================================================== ---- rust.orig/vendor/rustix-0.37.20/Cargo.toml -+++ rust/vendor/rustix-0.37.20/Cargo.toml -@@ -117,7 +117,6 @@ version = "3.5.0" +--- rust.orig/vendor/rustix-0.37.22/Cargo.toml ++++ rust/vendor/rustix-0.37.22/Cargo.toml +@@ -127,7 +127,6 @@ version = "3.4.0" [build-dependencies.cc] version = "1.0.68" diff --git a/debian/patches/d-rust-lldb-paths b/debian/patches/d-rust-lldb-paths index dddbec175..02935200e 100644 --- a/debian/patches/d-rust-lldb-paths +++ b/debian/patches/d-rust-lldb-paths @@ -23,7 +23,7 @@ Index: rust/src/etc/rust-lldb RUST_LLDB="$RUSTC_SYSROOT/lib/rustlib/$host/bin/lldb" -lldb=lldb -+lldb=lldb-16 ++lldb=lldb-17 if [ -f "$RUST_LLDB" ]; then lldb="$RUST_LLDB" else diff --git a/debian/patches/series b/debian/patches/series index 006ad623d..0c5160fa2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,7 +14,6 @@ u-ignore-endian-big-diff.patch u-fix-get-toml-when-test.patch u-disable-fp-precision-test-on-i386.patch u-riscv-disable-unpacked-split-debuginfo.patch -u-profiler.patch u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch # not forwarded, or forwarded but unlikely to be merged diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch deleted file mode 100644 index e7c1a3ced..000000000 --- a/debian/patches/u-profiler.patch +++ /dev/null @@ -1,139 +0,0 @@ -From d0b58f40a0e669897fafb614299d2a989997eda7 Mon Sep 17 00:00:00 2001 -From: Josh Stone -Date: Tue, 25 Jul 2023 13:11:50 -0700 -Subject: [PATCH] Allow using external builds of the compiler-rt profile lib - -This changes the bootstrap config `target.*.profiler` from a plain bool -to also allow a string, which will be used as a path to the pre-built -profiling runtime for that target. Then `profiler_builtins/build.rs` -reads that in a `LLVM_PROFILER_RT_LIB` environment variable. ---- - config.example.toml | 6 ++++-- - library/profiler_builtins/build.rs | 6 ++++++ - src/bootstrap/compile.rs | 4 ++++ - src/bootstrap/config.rs | 30 ++++++++++++++++++++++++------ - 4 files changed, 38 insertions(+), 8 deletions(-) - -Index: rust/config.example.toml -=================================================================== ---- rust.orig/config.example.toml -+++ rust/config.example.toml -@@ -752,8 +752,10 @@ changelog-seen = 2 - # This option will override the same option under [build] section. - #sanitizers = build.sanitizers (bool) - --# Build the profiler runtime for this target(required when compiling with options that depend --# on this runtime, such as `-C profile-generate` or `-C instrument-coverage`). -+# When true, build the profiler runtime for this target(required when compiling -+# with options that depend on this runtime, such as `-C profile-generate` or -+# `-C instrument-coverage`). This may also be given a path to an existing build -+# of the profiling runtime library from LLVM's compiler-rt. - # This option will override the same option under [build] section. - #profiler = build.profiler (bool) - -Index: rust/library/profiler_builtins/build.rs -=================================================================== ---- rust.orig/library/profiler_builtins/build.rs -+++ rust/library/profiler_builtins/build.rs -@@ -6,6 +6,12 @@ use std::env; - use std::path::Path; - - fn main() { -+ println!("cargo:rerun-if-env-changed=LLVM_PROFILER_RT_LIB"); -+ if let Ok(rt) = env::var("LLVM_PROFILER_RT_LIB") { -+ println!("cargo:rustc-link-lib=static:+verbatim={rt}"); -+ return; -+ } -+ - let target = env::var("TARGET").expect("TARGET was not set"); - let cfg = &mut cc::Build::new(); - -Index: rust/src/bootstrap/compile.rs -=================================================================== ---- rust.orig/src/bootstrap/compile.rs -+++ rust/src/bootstrap/compile.rs -@@ -336,6 +336,10 @@ pub fn std_cargo(builder: &Builder<'_>, - cargo.env("MACOSX_DEPLOYMENT_TARGET", target); - } - -+ if let Some(path) = builder.config.profiler_path(target) { -+ cargo.env("LLVM_PROFILER_RT_LIB", path); -+ } -+ - // Determine if we're going to compile in optimized C intrinsics to - // the `compiler-builtins` crate. These intrinsics live in LLVM's - // `compiler-rt` repository, but our `src/llvm-project` submodule isn't -Index: rust/src/bootstrap/config.rs -=================================================================== ---- rust.orig/src/bootstrap/config.rs -+++ rust/src/bootstrap/config.rs -@@ -533,7 +533,7 @@ pub struct Target { - pub linker: Option, - pub ndk: Option, - pub sanitizers: Option, -- pub profiler: Option, -+ pub profiler: Option, - pub rpath: Option, - pub crt_static: Option, - pub musl_root: Option, -@@ -862,9 +862,9 @@ define_config! { - } - } - --#[derive(Debug, Deserialize)] -+#[derive(Clone, Debug, Deserialize)] - #[serde(untagged)] --enum StringOrBool { -+pub enum StringOrBool { - String(String), - Bool(bool), - } -@@ -976,6 +976,12 @@ define_config! { - } - } - -+impl StringOrBool { -+ fn is_string_or_true(&self) -> bool { -+ matches!(self, Self::String(_) | Self::Bool(true)) -+ } -+} -+ - define_config! { - /// TOML representation of how each build target is configured. - struct TomlTarget { -@@ -991,7 +997,7 @@ define_config! { - llvm_libunwind: Option = "llvm-libunwind", - android_ndk: Option = "android-ndk", - sanitizers: Option = "sanitizers", -- profiler: Option = "profiler", -+ profiler: Option = "profiler", - rpath: Option = "rpath", - crt_static: Option = "crt-static", - musl_root: Option = "musl-root", -@@ -1887,12 +1893,24 @@ impl Config { - self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers - } - -+ pub fn profiler_path(&self, target: TargetSelection) -> Option<&str> { -+ match self.target_config.get(&target)?.profiler.as_ref()? { -+ StringOrBool::String(s) => Some(s), -+ StringOrBool::Bool(_) => None, -+ } -+ } -+ - pub fn profiler_enabled(&self, target: TargetSelection) -> bool { -- self.target_config.get(&target).map(|t| t.profiler).flatten().unwrap_or(self.profiler) -+ self.target_config -+ .get(&target) -+ .and_then(|t| t.profiler.as_ref()) -+ .map(StringOrBool::is_string_or_true) -+ .unwrap_or(self.profiler) - } - - pub fn any_profiler_enabled(&self) -> bool { -- self.target_config.values().any(|t| t.profiler == Some(true)) || self.profiler -+ self.target_config.values().any(|t| matches!(&t.profiler, Some(p) if p.is_string_or_true())) -+ || self.profiler - } - - pub fn rpath_enabled(&self, target: TargetSelection) -> bool { -- cgit v1.2.3