Merging debian version 1.75.0+dfsg1-3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

22 files changed, 535 insertions, 647 deletions

diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 2002ea30d..2ca3804d4 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -3,11 +3,11 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100
 Subject: d-0000-ignore-removed-submodules
 
 ---
- Cargo.toml                         |  7 -----
- src/bootstrap/bootstrap.py         |  4 ---
- src/bootstrap/builder.rs           | 54 +++++++++-----------------------------
- src/bootstrap/test.rs              | 12 +--------
- src/tools/rust-analyzer/Cargo.toml | 11 +++++++-
+ Cargo.toml                                 |  7 ----
+ src/bootstrap/bootstrap.py                 |  4 ---
+ src/bootstrap/src/core/build_steps/test.rs | 12 +------
+ src/bootstrap/src/core/builder.rs          | 54 +++++++-----------------------
+ src/tools/rust-analyzer/Cargo.toml         | 11 +++++-
  5 files changed, 24 insertions(+), 64 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
@@ -38,10 +38,10 @@ index 9b11ae8..19a98f9 100644
    "src/tools/lld-wrapper",
    "src/tools/collect-license-metadata",
 diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index fac0cdf..6fa1e9e 100644
+index 5a84e37..9bb09a6 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -962,10 +962,6 @@ class RustBuild(object):
+@@ -969,10 +969,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))
@@ -52,11 +52,34 @@ index fac0cdf..6fa1e9e 100644
          if self.get_toml("metrics", "build"):
              args.append("--features")
              args.append("build-metrics")
-diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 46a62ee..216158c 100644
---- a/src/bootstrap/builder.rs
-+++ b/src/bootstrap/builder.rs
-@@ -499,20 +499,20 @@ impl<'a> ShouldRun<'a> {
+diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
+index d2aa89d..1ea2d93 100644
+--- a/src/bootstrap/src/core/build_steps/test.rs
++++ b/src/bootstrap/src/core/build_steps/test.rs
+@@ -2278,17 +2278,7 @@ impl Step for RustcGuide {
+     }
+ 
+     fn run(self, builder: &Builder<'_>) {
+-        let relative_path = Path::new("src").join("doc").join("rustc-dev-guide");
+-        builder.update_submodule(&relative_path);
+-
+-        let src = builder.src.join(relative_path);
+-        let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
+-        let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) {
+-            ToolState::TestPass
+-        } else {
+-            ToolState::TestFail
+-        };
+-        builder.save_toolstate("rustc-dev-guide", toolstate);
++        builder.save_toolstate("rustc-dev-guide", ToolState::TestPass);
+     }
+ }
+ 
+diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
+index cd27667..2c870e9 100644
+--- a/src/bootstrap/src/core/builder.rs
++++ b/src/bootstrap/src/core/builder.rs
+@@ -498,20 +498,20 @@ impl<'a> ShouldRun<'a> {
          static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new();
  
          let init_submodules_paths = |src: &PathBuf| {
@@ -89,7 +112,7 @@ index 46a62ee..216158c 100644
  
              submodules_paths
          };
-@@ -686,25 +686,14 @@ impl<'a> Builder<'a> {
+@@ -685,25 +685,14 @@ impl<'a> Builder<'a> {
                  tool::Linkchecker,
                  tool::CargoTest,
                  tool::Compiletest,
@@ -115,7 +138,7 @@ index 46a62ee..216158c 100644
                  tool::OptimizedDist,
                  tool::CoverageDump,
              ),
-@@ -714,12 +703,7 @@ impl<'a> Builder<'a> {
+@@ -713,12 +702,7 @@ impl<'a> Builder<'a> {
                  check::Rustdoc,
                  check::CodegenBackend,
                  check::Clippy,
@@ -128,7 +151,7 @@ index 46a62ee..216158c 100644
                  check::Bootstrap
              ),
              Kind::Test => describe!(
-@@ -750,7 +734,6 @@ impl<'a> Builder<'a> {
+@@ -751,7 +735,6 @@ impl<'a> Builder<'a> {
                  test::TierCheck,
                  test::Cargotest,
                  test::Cargo,
@@ -136,7 +159,7 @@ index 46a62ee..216158c 100644
                  test::ErrorIndex,
                  test::Distcheck,
                  test::RunMakeFullDeps,
-@@ -766,7 +749,6 @@ impl<'a> Builder<'a> {
+@@ -767,7 +750,6 @@ impl<'a> Builder<'a> {
                  test::EmbeddedBook,
                  test::EditionGuide,
                  test::Rustfmt,
@@ -144,7 +167,7 @@ index 46a62ee..216158c 100644
                  test::Clippy,
                  test::RustDemangler,
                  test::CompiletestTest,
-@@ -803,7 +785,6 @@ impl<'a> Builder<'a> {
+@@ -804,7 +786,6 @@ impl<'a> Builder<'a> {
                  doc::CargoBook,
                  doc::Clippy,
                  doc::ClippyBook,
@@ -152,7 +175,7 @@ index 46a62ee..216158c 100644
                  doc::EmbeddedBook,
                  doc::EditionGuide,
                  doc::StyleGuide,
-@@ -821,12 +802,9 @@ impl<'a> Builder<'a> {
+@@ -823,12 +804,9 @@ impl<'a> Builder<'a> {
                  dist::Analysis,
                  dist::Src,
                  dist::Cargo,
@@ -165,7 +188,7 @@ index 46a62ee..216158c 100644
                  dist::LlvmTools,
                  dist::RustDev,
                  dist::Bootstrap,
-@@ -843,11 +821,9 @@ impl<'a> Builder<'a> {
+@@ -845,11 +823,9 @@ impl<'a> Builder<'a> {
                  install::Docs,
                  install::Std,
                  install::Cargo,
@@ -177,7 +200,7 @@ index 46a62ee..216158c 100644
                  install::LlvmTools,
                  install::Src,
                  install::Rustc
-@@ -857,7 +833,6 @@ impl<'a> Builder<'a> {
+@@ -859,7 +835,6 @@ impl<'a> Builder<'a> {
                  run::BuildManifest,
                  run::BumpStage0,
                  run::ReplaceVersionPlaceholder,
@@ -185,7 +208,7 @@ index 46a62ee..216158c 100644
                  run::CollectLicenseMetadata,
                  run::GenerateCopyright,
                  run::GenerateWindowsSys,
-@@ -1998,10 +1973,7 @@ impl<'a> Builder<'a> {
+@@ -2045,10 +2020,7 @@ impl<'a> Builder<'a> {
              }
          }
  
@@ -197,29 +220,6 @@ index 46a62ee..216158c 100644
              cargo.arg("--frozen");
          }
  
-diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index ba030f0..ba2e669 100644
---- a/src/bootstrap/test.rs
-+++ b/src/bootstrap/test.rs
-@@ -2167,17 +2167,7 @@ impl Step for RustcGuide {
-     }
- 
-     fn run(self, builder: &Builder<'_>) {
--        let relative_path = Path::new("src").join("doc").join("rustc-dev-guide");
--        builder.update_submodule(&relative_path);
--
--        let src = builder.src.join(relative_path);
--        let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
--        let toolstate = if builder.run_delaying_failure(rustbook_cmd.arg("linkcheck").arg(&src)) {
--            ToolState::TestPass
--        } else {
--            ToolState::TestFail
--        };
--        builder.save_toolstate("rustc-dev-guide", toolstate);
-+        builder.save_toolstate("rustc-dev-guide", ToolState::TestPass);
-     }
- }
- 
 diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
 index cab88fc..5bac437 100644
 --- a/src/tools/rust-analyzer/Cargo.toml
diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch
index ea3975d6f..1ff501dc3 100644
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/d-0005-no-jemalloc.patch
@@ -8,12 +8,12 @@ Subject: d-0005-no-jemalloc
  2 files changed, 8 deletions(-)
 
 diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
-index dcb165f..e211d6f 100644
+index 3cb56a7..af37dfc 100644
 --- a/compiler/rustc/Cargo.toml
 +++ b/compiler/rustc/Cargo.toml
-@@ -15,13 +15,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
- rustc_smir = { path = "../rustc_smir" }
+@@ -20,14 +20,8 @@ rustc_smir = { path = "../rustc_smir" }
  stable_mir = { path = "../stable_mir" }
+ # tidy-alphabetical-end
  
 -[dependencies.jemalloc-sys]
 -version = "0.5.0"
@@ -21,6 +21,7 @@ index dcb165f..e211d6f 100644
 -features = ['unprefixed_malloc_on_supported_platforms']
 -
  [features]
+ # tidy-alphabetical-start
 -jemalloc = ['jemalloc-sys']
  llvm = ['rustc_driver_impl/llvm']
  max_level_info = ['rustc_driver_impl/max_level_info']
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 cc0ab7881..0df7a9ec8 100644
--- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
+++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
@@ -8,10 +8,10 @@ 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 4403044..23c5cc7 100644
+index 3fb36b4..c011909 100644
 --- a/src/tools/cargo/Cargo.toml
 +++ b/src/tools/cargo/Cargo.toml
-@@ -217,7 +217,5 @@ test = false
+@@ -226,7 +226,5 @@ test = false
  doc = false
  
  [features]
diff --git a/debian/patches/d-0012-cargo-always-return-dev-channel.patch b/debian/patches/d-0012-cargo-always-return-dev-channel.patch
index 86e67ed75..2465a48cb 100644
--- a/debian/patches/d-0012-cargo-always-return-dev-channel.patch
+++ b/debian/patches/d-0012-cargo-always-return-dev-channel.patch
@@ -8,10 +8,10 @@ Last-Update: 2023-05-30
  1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs
-index 5faa208..eefbf78 100644
+index 72a267f..032a1ef 100644
 --- a/src/tools/cargo/src/cargo/core/features.rs
 +++ b/src/tools/cargo/src/cargo/core/features.rs
-@@ -1212,9 +1212,8 @@ pub fn channel() -> String {
+@@ -1192,9 +1192,8 @@ pub fn channel() -> String {
              return "dev".to_string();
          }
      }
diff --git a/debian/patches/d-0020-remove-windows-dependencies.patch b/debian/patches/d-0020-remove-windows-dependencies.patch
index cc3514750..dd4f4d88d 100644
--- a/debian/patches/d-0020-remove-windows-dependencies.patch
+++ b/debian/patches/d-0020-remove-windows-dependencies.patch
@@ -4,30 +4,30 @@ Subject: d-0020-remove-windows-dependencies
 
 ===================================================================
 ---
- compiler/rustc_codegen_ssa/Cargo.toml               |  4 ----
- compiler/rustc_data_structures/Cargo.toml           | 10 ----------
- compiler/rustc_driver_impl/Cargo.toml               |  6 ------
- compiler/rustc_errors/Cargo.toml                    |  8 --------
- compiler/rustc_session/Cargo.toml                   |  7 -------
- library/backtrace/Cargo.toml                        | 13 -------------
- src/bootstrap/Cargo.toml                            | 15 ---------------
- src/tools/cargo/Cargo.toml                          | 21 +++------------------
- .../cargo/crates/cargo-test-support/Cargo.toml      |  3 ---
- src/tools/cargo/crates/cargo-util/Cargo.toml        |  7 -------
- src/tools/cargo/crates/home/Cargo.toml              |  3 ---
- .../cargo/credential/cargo-credential/Cargo.toml    |  3 ---
- src/tools/cargo/src/cargo/util/auth/mod.rs          |  2 --
- src/tools/compiletest/Cargo.toml                    | 10 ----------
- src/tools/rust-analyzer/crates/profile/Cargo.toml   |  3 ---
- .../rust-analyzer/crates/rust-analyzer/Cargo.toml   |  6 ------
- src/tools/rust-analyzer/crates/stdx/Cargo.toml      |  4 ----
- 17 files changed, 3 insertions(+), 122 deletions(-)
+ compiler/rustc_codegen_ssa/Cargo.toml              |  4 ----
+ compiler/rustc_data_structures/Cargo.toml          | 10 ----------
+ compiler/rustc_driver_impl/Cargo.toml              |  6 ------
+ compiler/rustc_errors/Cargo.toml                   |  8 --------
+ compiler/rustc_session/Cargo.toml                  |  7 -------
+ library/backtrace/Cargo.toml                       | 13 ------------
+ src/bootstrap/Cargo.toml                           | 15 --------------
+ src/tools/cargo/Cargo.toml                         | 23 ++++------------------
+ .../cargo/crates/cargo-test-support/Cargo.toml     |  3 ---
+ src/tools/cargo/crates/cargo-util/Cargo.toml       |  7 -------
+ src/tools/cargo/crates/home/Cargo.toml             |  3 ---
+ .../cargo/credential/cargo-credential/Cargo.toml   |  3 ---
+ src/tools/cargo/src/cargo/util/auth/mod.rs         |  5 -----
+ src/tools/compiletest/Cargo.toml                   | 10 ----------
+ src/tools/rust-analyzer/crates/profile/Cargo.toml  |  3 ---
+ .../rust-analyzer/crates/rust-analyzer/Cargo.toml  |  6 ------
+ src/tools/rust-analyzer/crates/stdx/Cargo.toml     |  4 ----
+ 17 files changed, 4 insertions(+), 126 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
-index 34d0e2d..2cb22f0 100644
+index 4dae49f..20453c2 100644
 --- a/compiler/rustc_codegen_ssa/Cargo.toml
 +++ b/compiler/rustc_codegen_ssa/Cargo.toml
-@@ -45,7 +45,3 @@ libc = "0.2.50"
+@@ -49,7 +49,3 @@ libc = "0.2.50"
  version = "0.32.0"
  default-features = false
  features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"]
@@ -36,10 +36,10 @@ index 34d0e2d..2cb22f0 100644
 -version = "0.48.0"
 -features = ["Win32_Globalization"]
 diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
-index f77bd53..a3d1810 100644
+index 8d91c4c..0de63d9 100644
 --- a/compiler/rustc_data_structures/Cargo.toml
 +++ b/compiler/rustc_data_structures/Cargo.toml
-@@ -37,16 +37,6 @@ itertools = "0.10.1"
+@@ -32,16 +32,6 @@ tracing = "0.1"
  [dependencies.parking_lot]
  version = "0.12"
  
@@ -54,15 +54,15 @@ index f77bd53..a3d1810 100644
 -]
 -
  [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
+ # tidy-alphabetical-start
  memmap2 = "0.2.1"
- 
 diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
-index a7b0161..62c4249 100644
+index da7c244..80547ce 100644
 --- a/compiler/rustc_driver_impl/Cargo.toml
 +++ b/compiler/rustc_driver_impl/Cargo.toml
-@@ -57,12 +57,6 @@ rustc_mir_transform = { path = "../rustc_mir_transform" }
- [target.'cfg(unix)'.dependencies]
+@@ -58,12 +58,6 @@ tracing = { version = "0.1.35" }
  libc = "0.2"
+ # tidy-alphabetical-end
  
 -[target.'cfg(windows)'.dependencies.windows]
 -version = "0.48.0"
@@ -71,15 +71,15 @@ index a7b0161..62c4249 100644
 -]
 -
  [features]
+ # tidy-alphabetical-start
  llvm = ['rustc_interface/llvm']
- max_level_info = ['rustc_log/max_level_info']
 diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml
-index faab9f0..3ea55cb 100644
+index fc3ff83..4f74aec 100644
 --- a/compiler/rustc_errors/Cargo.toml
 +++ b/compiler/rustc_errors/Cargo.toml
-@@ -27,13 +27,5 @@ serde = { version = "1.0.125", features = [ "derive" ] }
- serde_json = "1.0.59"
- derive_setters = "0.1.6"
+@@ -27,14 +27,6 @@ tracing = "0.1"
+ unicode-width = "0.1.4"
+ # tidy-alphabetical-end
  
 -[target.'cfg(windows)'.dependencies.windows]
 -version = "0.48.0"
@@ -90,15 +90,16 @@ index faab9f0..3ea55cb 100644
 -]
 -
  [features]
+ # tidy-alphabetical-start
  rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler']
 diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml
-index e26d25d..fe343f8 100644
+index 1f51dd6..2974bd0 100644
 --- a/compiler/rustc_session/Cargo.toml
 +++ b/compiler/rustc_session/Cargo.toml
-@@ -24,10 +24,3 @@ termize = "0.1.1"
- 
- [target.'cfg(unix)'.dependencies]
+@@ -28,10 +28,3 @@ tracing = "0.1"
+ # tidy-alphabetical-start
  libc = "0.2"
+ # tidy-alphabetical-end
 -
 -[target.'cfg(windows)'.dependencies.windows]
 -version = "0.48.0"
@@ -107,12 +108,12 @@ index e26d25d..fe343f8 100644
 -    "Win32_System_LibraryLoader",
 -]
 diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml
-index 6714b3b..71d56b4 100644
+index 932310b..dce3c3f 100644
 --- a/library/backtrace/Cargo.toml
 +++ b/library/backtrace/Cargo.toml
-@@ -47,9 +47,6 @@ version = "0.32.0"
+@@ -48,9 +48,6 @@ version = "0.32.0"
  default-features = false
- features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
+ features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive']
  
 -[target.'cfg(windows)'.dependencies]
 -winapi = { version = "0.3.9", optional = true }
@@ -120,7 +121,7 @@ index 6714b3b..71d56b4 100644
  [build-dependencies]
  # Only needed for Android, but cannot be target dependent
  # https://github.com/rust-lang/cargo/issues/4932
-@@ -87,16 +84,6 @@ libbacktrace = []
+@@ -88,16 +85,6 @@ libbacktrace = []
  libunwind = []
  unix-backtrace = []
  verify-winapi = [
@@ -138,18 +139,18 @@ index 6714b3b..71d56b4 100644
  
  [[example]]
 diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
-index 9bf2694..9fc6f66 100644
+index e4d3591..b548faf 100644
 --- a/src/bootstrap/Cargo.toml
 +++ b/src/bootstrap/Cargo.toml
-@@ -62,21 +62,6 @@ semver = "1.0.17"
+@@ -66,21 +66,6 @@ sysinfo = { version = "0.26.0", optional = true }
  [target.'cfg(not(target_os = "solaris"))'.dependencies]
- fd-lock = "3.0.8"
+ fd-lock = "3.0.13"
  
 -[target.'cfg(windows)'.dependencies.junction]
 -version = "1.0.0"
 -
 -[target.'cfg(windows)'.dependencies.windows]
--version = "0.46.0"
+-version = "0.51.1"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_Security",
@@ -164,7 +165,7 @@ index 9bf2694..9fc6f66 100644
  pretty_assertions = "1.4"
  
 diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
-index 23c5cc7..91ecfd0 100644
+index c011909..989d8d4 100644
 --- a/src/tools/cargo/Cargo.toml
 +++ b/src/tools/cargo/Cargo.toml
 @@ -2,7 +2,9 @@
@@ -180,34 +181,46 @@ index 23c5cc7..91ecfd0 100644
  ]
 @@ -24,8 +26,6 @@ bytesize = "1.3"
  cargo = { path = "" }
- cargo-credential = { version = "0.4.0", path = "credential/cargo-credential" }
- cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" }
--cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" }
--cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" }
+ cargo-credential = { version = "0.4.1", path = "credential/cargo-credential" }
+ cargo-credential-libsecret = { version = "0.4.1", path = "credential/cargo-credential-libsecret" }
+-cargo-credential-macos-keychain = { version = "0.4.1", path = "credential/cargo-credential-macos-keychain" }
+-cargo-credential-wincred = { version = "0.4.1", path = "credential/cargo-credential-wincred" }
  cargo-platform = { path = "crates/cargo-platform", version = "0.1.4" }
  cargo-test-macro = { path = "crates/cargo-test-macro" }
  cargo-test-support = { path = "crates/cargo-test-support" }
-@@ -101,7 +101,6 @@ unicode-xid = "0.2.4"
+@@ -102,7 +102,6 @@ unicode-xid = "0.2.4"
  url = "2.4.1"
  varisat = "0.2.2"
- walkdir = "2.3.3"
+ walkdir = "2.4.0"
 -windows-sys = "0.48"
  
  [package]
  name = "cargo"
-@@ -128,8 +127,6 @@ bytesize.workspace = true
- cargo-platform.workspace = true
+@@ -129,6 +128,7 @@ base64.workspace = true
+ bytesize.workspace = true
  cargo-credential.workspace = true
- cargo-credential-libsecret.workspace = true
--cargo-credential-macos-keychain.workspace = true
--cargo-credential-wincred.workspace = true
+ cargo-platform.workspace = true
++cargo-credential-libsecret.workspace = true
  cargo-util.workspace = true
- color-print.workspace = true
  clap = { workspace = true, features = ["wrap_help"] }
-@@ -189,18 +186,6 @@ walkdir.workspace = true
+ color-print.workspace = true
+@@ -189,9 +189,6 @@ walkdir.workspace = true
+ [target.'cfg(target_os = "linux")'.dependencies]
+ cargo-credential-libsecret.workspace = true
+ 
+-[target.'cfg(target_os = "macos")'.dependencies]
+-cargo-credential-macos-keychain.workspace = true
+-
  [target.'cfg(not(windows))'.dependencies]
  openssl = { workspace = true, optional = true }
  
+@@ -195,21 +195,6 @@ cargo-credential-macos-keychain.workspace = true
+ [target.'cfg(not(windows))'.dependencies]
+ openssl = { workspace = true, optional = true }
+ 
+-[target.'cfg(windows)'.dependencies]
+-cargo-credential-wincred.workspace = true
+-
 -[target.'cfg(windows)'.dependencies.windows-sys]
 -workspace = true
 -features = [
@@ -235,7 +248,7 @@ index fc32e1c..ce5d708 100644
 -[target.'cfg(windows)'.dependencies]
 -windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] }
 diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml
-index cba00f9..fb52b6e 100644
+index 616a79c..9fc3971 100644
 --- a/src/tools/cargo/crates/cargo-util/Cargo.toml
 +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
 @@ -20,10 +20,3 @@ shell-escape.workspace = true
@@ -250,10 +263,10 @@ index cba00f9..fb52b6e 100644
 -miow.workspace = true
 -windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] }
 diff --git a/src/tools/cargo/crates/home/Cargo.toml b/src/tools/cargo/crates/home/Cargo.toml
-index 03bd555..32fdf26 100644
+index 702a14e..dafeec8 100644
 --- a/src/tools/cargo/crates/home/Cargo.toml
 +++ b/src/tools/cargo/crates/home/Cargo.toml
-@@ -14,6 +14,3 @@ include = [
+@@ -15,6 +15,3 @@ include = [
  license.workspace = true
  repository = "https://github.com/rust-lang/cargo"
  description = "Shared definitions of home directories."
@@ -261,7 +274,7 @@ index 03bd555..32fdf26 100644
 -[target.'cfg(windows)'.dependencies]
 -windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell"] }
 diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml
-index c8db996..96aa498 100644
+index 8ba65b8..6678c23 100644
 --- a/src/tools/cargo/credential/cargo-credential/Cargo.toml
 +++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml
 @@ -15,8 +15,5 @@ serde_json.workspace = true
@@ -274,23 +287,26 @@ index c8db996..96aa498 100644
  [dev-dependencies]
  snapbox = { workspace = true, features = ["examples"] }
 diff --git a/src/tools/cargo/src/cargo/util/auth/mod.rs b/src/tools/cargo/src/cargo/util/auth/mod.rs
-index ea82dce..df181db 100644
+index c2f8186..c420971 100644
 --- a/src/tools/cargo/src/cargo/util/auth/mod.rs
 +++ b/src/tools/cargo/src/cargo/util/auth/mod.rs
-@@ -529,8 +529,6 @@ fn credential_action(
+@@ -529,11 +529,6 @@ fn credential_action(
              }
              "cargo:paseto" => bail!("cargo:paseto requires -Zasymmetric-token"),
              "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}),
+-            #[cfg(windows)]
 -            "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}),
+-            #[cfg(target_os = "macos")]
 -            "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}),
+-            #[cfg(target_os = "linux")]
              "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}),
-             process => Box::new(CredentialProcessCredential::new(process)),
-         };
+             name if BUILT_IN_PROVIDERS.contains(&name) => {
+                 Box::new(cargo_credential::UnsupportedCredential {})
 diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
-index bb1fa6e..2735e1e 100644
+index 31c6353..bdc4805 100644
 --- a/src/tools/compiletest/Cargo.toml
 +++ b/src/tools/compiletest/Cargo.toml
-@@ -28,13 +28,3 @@ home = "0.5.5"
+@@ -29,13 +29,3 @@ home = "0.5.5"
  
  [target.'cfg(unix)'.dependencies]
  libc = "0.2"
@@ -305,7 +321,7 @@ index bb1fa6e..2735e1e 100644
 -    "Win32_System_Diagnostics_Debug",
 -]
 diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
-index fd98d85..8c1d1379 100644
+index fd98d85..8c1d137 100644
 --- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
 @@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] }
diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
index 80cb21a53..895d091b8 100644
--- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
+++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
@@ -1,6 +1,6 @@
 From: =?utf-8?q?Fabian_Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Wed, 6 Sep 2023 13:23:24 -0600
-Subject: [PATCH] Remove Windows dependencies
+Subject: d-0021-vendor-remove-windows-dependencies
 MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
@@ -18,18 +18,20 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  vendor/console/Cargo.toml                | 11 ---------
  vendor/curl-sys/Cargo.toml               |  7 ------
  vendor/curl/Cargo.toml                   | 10 --------
- vendor/dirs-sys-next/Cargo.toml          |  3 ---
- vendor/dirs-sys/Cargo.toml               |  3 ---
+ vendor/dirs-sys-0.3.7/Cargo.toml         |  3 ---
+ vendor/dirs-sys/Cargo.toml               |  9 -------
+ vendor/errno-0.3.1/Cargo.toml            |  7 ------
  vendor/errno/Cargo.toml                  |  6 -----
  vendor/fd-lock/Cargo.toml                |  8 -------
  vendor/filetime/Cargo.toml               |  7 ------
  vendor/gix-sec/Cargo.toml                | 12 ----------
+ vendor/home-0.5.4/Cargo.toml             |  8 -------
  vendor/home/Cargo.toml                   |  7 ------
  vendor/iana-time-zone/Cargo.toml         |  4 ----
  vendor/ignore/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-0.8.0/Cargo.toml       |  8 -------
  vendor/libloading/Cargo.toml             |  8 -------
  vendor/libssh2-sys/Cargo.toml            |  8 -------
  vendor/libz-sys/Cargo.toml               |  3 ---
@@ -42,6 +44,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ----------
  vendor/parking_lot_core/Cargo.toml       |  3 ---
  vendor/reqwest/Cargo.toml                |  3 ---
+ vendor/rustix-0.38.19/Cargo.toml         | 17 -------------
  vendor/rustix/Cargo.toml                 | 17 -------------
  vendor/same-file/Cargo.toml              |  2 --
  vendor/snapbox/Cargo.toml                |  6 -----
@@ -49,6 +52,7 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  vendor/stacker/Cargo.toml                | 10 --------
  vendor/sysinfo-0.26.7/Cargo.toml         | 38 -----------------------------
  vendor/sysinfo/Cargo.toml                | 41 --------------------------------
+ vendor/tempfile-3.8.0/Cargo.toml         |  7 ------
  vendor/tempfile/Cargo.toml               |  7 ------
  vendor/term/Cargo.toml                   |  6 -----
  vendor/termcolor/Cargo.toml              |  3 ---
@@ -57,23 +61,24 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  vendor/tokio-native-tls/Cargo.toml       | 17 -------------
  vendor/tokio/Cargo.toml                  | 21 ----------------
  vendor/uuid/Cargo.toml                   |  4 ----
+ vendor/walkdir-2.3.3/Cargo.toml          |  3 ---
  vendor/walkdir/Cargo.toml                |  3 ---
  vendor/yansi-term/Cargo.toml             |  3 ---
- 56 files changed, 1 insertion(+), 489 deletions(-)
+ 58 files changed, 1 insertion(+), 495 deletions(-)
 
-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/
+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"
  
  [dev-dependencies.zip]
  version = "0.6.4"
 +repository = "https://github.com/rust-cli/concolor"
-Index: rust/vendor/ansi_term/Cargo.toml
-===================================================================
---- rust.orig/vendor/ansi_term/Cargo.toml
-+++ rust/vendor/ansi_term/Cargo.toml
+diff --git a/vendor/ansi_term/Cargo.toml b/vendor/ansi_term/Cargo.toml
+index 0e5feba..3256c75 100644
+--- a/vendor/ansi_term/Cargo.toml
++++ b/vendor/ansi_term/Cargo.toml
 @@ -38,6 +38,3 @@ version = "1.0.39"
  
  [features]
@@ -81,10 +86,10 @@ Index: rust/vendor/ansi_term/Cargo.toml
 -[target."cfg(target_os=\"windows\")".dependencies.winapi]
 -version = "0.3.4"
 -features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"]
-Index: rust/vendor/anstream/Cargo.toml
-===================================================================
---- rust.orig/vendor/anstream/Cargo.toml
-+++ rust/vendor/anstream/Cargo.toml
+diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml
+index 2919a8b..f403587 100644
+--- a/vendor/anstream/Cargo.toml
++++ b/vendor/anstream/Cargo.toml
 @@ -131,11 +131,4 @@ auto = [
  ]
  default = [
@@ -97,10 +102,25 @@ Index: rust/vendor/anstream/Cargo.toml
 -[target."cfg(windows)".dependencies.anstyle-wincon]
 -version = "3.0.1"
 -optional = true
-Index: rust/vendor/anstyle-query/Cargo.toml
-===================================================================
---- rust.orig/vendor/anstyle-query/Cargo.toml
-+++ rust/vendor/anstyle-query/Cargo.toml
+diff --git a/vendor/anstream-0.5.0/Cargo.toml b/vendor/anstream-0.5.0/Cargo.toml
+index 1b5193c..9574485 100644
+--- a/vendor/anstream-0.5.0/Cargo.toml
++++ b/vendor/anstream-0.5.0/Cargo.toml
+@@ -131,10 +131,5 @@ auto = [
+ ]
+ default = [
+     "auto",
+-    "wincon",
+ ]
+-wincon = ["dep:anstyle-wincon"]
+ 
+-[target."cfg(windows)".dependencies.anstyle-wincon]
+-version = "2.0.0"
+-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
 @@ -70,10 +70,3 @@ replace = """
  <!-- next-url -->
  [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD"""
@@ -112,10 +132,10 @@ Index: rust/vendor/anstyle-query/Cargo.toml
 -    "Win32_System_Console",
 -    "Win32_Foundation",
 -]
-Index: rust/vendor/atty/Cargo.toml
-===================================================================
---- rust.orig/vendor/atty/Cargo.toml
-+++ rust/vendor/atty/Cargo.toml
+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
 @@ -27,8 +27,5 @@ version = "0.1.6"
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
@@ -125,10 +145,10 @@ Index: rust/vendor/atty/Cargo.toml
 -features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"]
  [badges.travis-ci]
  repository = "softprops/atty"
-Index: rust/vendor/backtrace/Cargo.toml
-===================================================================
---- rust.orig/vendor/backtrace/Cargo.toml
-+++ rust/vendor/backtrace/Cargo.toml
+diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml
+index c13e7ee..7b01a6f 100644
+--- a/vendor/backtrace/Cargo.toml
++++ b/vendor/backtrace/Cargo.toml
 @@ -104,16 +104,6 @@ serialize-serde = ["serde"]
  std = []
  unix-backtrace = []
@@ -154,10 +174,10 @@ Index: rust/vendor/backtrace/Cargo.toml
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3.9"
 -optional = true
-Index: rust/vendor/chrono/Cargo.toml
-===================================================================
---- rust.orig/vendor/chrono/Cargo.toml
-+++ rust/vendor/chrono/Cargo.toml
+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
 @@ -107,7 +107,6 @@ __internal_bench = ["criterion"]
  alloc = []
  clock = [
@@ -181,10 +201,10 @@ Index: rust/vendor/chrono/Cargo.toml
 -    "sysinfoapi",
 -]
 -optional = true
-Index: rust/vendor/colored/Cargo.toml
-===================================================================
---- rust.orig/vendor/colored/Cargo.toml
-+++ rust/vendor/colored/Cargo.toml
+diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml
+index dda2951..05b76bd 100644
+--- a/vendor/colored/Cargo.toml
++++ b/vendor/colored/Cargo.toml
 @@ -42,10 +42,3 @@ version = "=1.0.0-beta.3"
  
  [features]
@@ -196,10 +216,10 @@ Index: rust/vendor/colored/Cargo.toml
 -    "Win32_Foundation",
 -    "Win32_System_Console",
 -]
-Index: rust/vendor/console/Cargo.toml
-===================================================================
---- rust.orig/vendor/console/Cargo.toml
-+++ rust/vendor/console/Cargo.toml
+diff --git a/vendor/console/Cargo.toml b/vendor/console/Cargo.toml
+index 85849e1..7c7be5a 100644
+--- a/vendor/console/Cargo.toml
++++ b/vendor/console/Cargo.toml
 @@ -59,14 +59,3 @@ default = [
  ]
  windows-console-colors = ["ansi-parsing"]
@@ -215,10 +235,10 @@ Index: rust/vendor/console/Cargo.toml
 -    "Win32_Storage_FileSystem",
 -    "Win32_UI_Input_KeyboardAndMouse",
 -]
-Index: rust/vendor/curl-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/curl-sys/Cargo.toml
-+++ rust/vendor/curl-sys/Cargo.toml
+diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml
+index b36d525..4b5cee1 100644
+--- a/vendor/curl-sys/Cargo.toml
++++ b/vendor/curl-sys/Cargo.toml
 @@ -73,13 +73,6 @@ zlib-ng-compat = [
  version = "0.9.64"
  optional = true
@@ -233,10 +253,10 @@ Index: rust/vendor/curl-sys/Cargo.toml
  [badges.appveyor]
  repository = "alexcrichton/curl-rust"
  
-Index: rust/vendor/curl/Cargo.toml
-===================================================================
---- rust.orig/vendor/curl/Cargo.toml
-+++ rust/vendor/curl/Cargo.toml
+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
 @@ -107,16 +107,6 @@ optional = true
  version = "0.9.43"
  optional = true
@@ -254,37 +274,37 @@ Index: rust/vendor/curl/Cargo.toml
  [badges.appveyor]
  repository = "alexcrichton/curl-rust"
  
-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"
+diff --git a/vendor/dirs-sys-0.3.7/Cargo.toml b/vendor/dirs-sys-0.3.7/Cargo.toml
+index 9951d24..0a86f4d 100644
+--- a/vendor/dirs-sys-0.3.7/Cargo.toml
++++ b/vendor/dirs-sys-0.3.7/Cargo.toml
+@@ -22,6 +22,3 @@ version = "0.4"
  default-features = false
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3"
 -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
- [badges.maintenance]
- status = "as-is"
-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"
+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
+@@ -25,8 +25,5 @@ version = "0.4.0"
  default-features = false
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3"
 -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
-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]
+ [badges.maintenance]
+ status = "as-is"
+diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml
+index d35ef19..e5e18a3 100644
+--- a/vendor/errno/Cargo.toml
++++ b/vendor/errno/Cargo.toml
+@@ -41,9 +41,3 @@ default-features = false
  version = "0.2"
+ default-features = false
  
 -[target."cfg(windows)".dependencies.windows-sys]
 -version = "0.48"
@@ -292,26 +312,26 @@ Index: rust/vendor/errno/Cargo.toml
 -    "Win32_Foundation",
 -    "Win32_System_Diagnostics_Debug",
 -]
-Index: rust/vendor/fd-lock/Cargo.toml
-===================================================================
---- rust.orig/vendor/fd-lock/Cargo.toml
-+++ rust/vendor/fd-lock/Cargo.toml
+diff --git a/vendor/fd-lock/Cargo.toml b/vendor/fd-lock/Cargo.toml
+index 8d0b8f0..eb1ef13 100644
+--- a/vendor/fd-lock/Cargo.toml
++++ b/vendor/fd-lock/Cargo.toml
 @@ -43,11 +43,3 @@ version = "3.0.8"
  [target."cfg(unix)".dependencies.rustix]
- version = "0.37.0"
+ version = "0.38.0"
  features = ["fs"]
 -
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
+-version = "0.48.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_Storage_FileSystem",
 -    "Win32_System_IO",
 -]
-Index: rust/vendor/filetime/Cargo.toml
-===================================================================
---- rust.orig/vendor/filetime/Cargo.toml
-+++ rust/vendor/filetime/Cargo.toml
+diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml
+index 5c28c6c..b32fbcc 100644
+--- a/vendor/filetime/Cargo.toml
++++ b/vendor/filetime/Cargo.toml
 @@ -38,10 +38,3 @@ version = "0.3.5"
  
  [target."cfg(unix)".dependencies.libc]
@@ -323,10 +343,10 @@ Index: rust/vendor/filetime/Cargo.toml
 -    "Win32_Foundation",
 -    "Win32_Storage_FileSystem",
 -]
-Index: rust/vendor/gix-sec/Cargo.toml
-===================================================================
---- rust.orig/vendor/gix-sec/Cargo.toml
-+++ rust/vendor/gix-sec/Cargo.toml
+diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml
+index 8605b90..9db4399 100644
+--- a/vendor/gix-sec/Cargo.toml
++++ b/vendor/gix-sec/Cargo.toml
 @@ -63,15 +63,3 @@ serde = [
  [target."cfg(not(windows))".dependencies.libc]
  version = "0.2.123"
@@ -343,10 +363,10 @@ Index: rust/vendor/gix-sec/Cargo.toml
 -    "Win32_System_Memory",
 -    "Win32_System_Threading",
 -]
-Index: rust/vendor/home/Cargo.toml
-===================================================================
---- rust.orig/vendor/home/Cargo.toml
-+++ rust/vendor/home/Cargo.toml
+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
 @@ -27,10 +27,3 @@ readme = "README.md"
  license = "MIT OR Apache-2.0"
  repository = "https://github.com/rust-lang/cargo"
@@ -358,10 +378,10 @@ Index: rust/vendor/home/Cargo.toml
 -    "Win32_Foundation",
 -    "Win32_UI_Shell",
 -]
-Index: rust/vendor/iana-time-zone/Cargo.toml
-===================================================================
---- rust.orig/vendor/iana-time-zone/Cargo.toml
-+++ rust/vendor/iana-time-zone/Cargo.toml
+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
 @@ -52,7 +52,3 @@ version = "0.1.5"
  
  [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku]
@@ -370,10 +390,10 @@ Index: rust/vendor/iana-time-zone/Cargo.toml
 -[target."cfg(target_os = \"windows\")".dependencies.windows]
 -version = "0.48.0"
 -features = ["Globalization"]
-Index: rust/vendor/ignore/Cargo.toml
-===================================================================
---- rust.orig/vendor/ignore/Cargo.toml
-+++ rust/vendor/ignore/Cargo.toml
+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
 @@ -64,6 +64,3 @@ version = "0.5.0"
  
  [features]
@@ -381,38 +401,10 @@ Index: rust/vendor/ignore/Cargo.toml
 -
 -[target."cfg(windows)".dependencies.winapi-util]
 -version = "0.1.2"
-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",
-     "hermit-abi",
--    "windows-sys",
- ]
- default = ["close"]
- 
-@@ -85,15 +84,3 @@ optional = true
- [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi]
- version = "0.3"
- optional = true
--
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
--features = [
--    "Win32_Foundation",
--    "Win32_Storage_FileSystem",
--    "Win32_Networking_WinSock",
--    "Win32_Security",
--    "Win32_System_IO",
--    "Win32_System_Threading",
--]
--optional = true
-Index: rust/vendor/is-terminal/Cargo.toml
-===================================================================
---- rust.orig/vendor/is-terminal/Cargo.toml
-+++ rust/vendor/is-terminal/Cargo.toml
+diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml
+index 08933a7..b4b0482 100644
+--- a/vendor/is-terminal/Cargo.toml
++++ b/vendor/is-terminal/Cargo.toml
 @@ -54,14 +54,3 @@ features = ["stdio"]
  
  [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi]
@@ -428,10 +420,10 @@ Index: rust/vendor/is-terminal/Cargo.toml
 -
 -[target."cfg(windows)".dev-dependencies.tempfile]
 -version = "3"
-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
+diff --git a/vendor/libloading-0.7.4/Cargo.toml b/vendor/libloading-0.7.4/Cargo.toml
+index 65168d5..03df764 100644
+--- a/vendor/libloading-0.7.4/Cargo.toml
++++ b/vendor/libloading-0.7.4/Cargo.toml
 @@ -43,9 +43,3 @@ version = "1.1"
  [target."cfg(unix)".dependencies.cfg-if]
  version = "1"
@@ -442,10 +434,10 @@ Index: rust/vendor/libloading-0.7.4/Cargo.toml
 -    "errhandlingapi",
 -    "libloaderapi",
 -]
-Index: rust/vendor/libloading/Cargo.toml
-===================================================================
---- rust.orig/vendor/libloading/Cargo.toml
-+++ rust/vendor/libloading/Cargo.toml
+diff --git a/vendor/libloading/Cargo.toml b/vendor/libloading/Cargo.toml
+index 0165453..0dfc3c0 100644
+--- a/vendor/libloading/Cargo.toml
++++ b/vendor/libloading/Cargo.toml
 @@ -42,11 +42,3 @@ version = "1.1"
  
  [target."cfg(unix)".dependencies.cfg-if]
@@ -458,10 +450,10 @@ Index: rust/vendor/libloading/Cargo.toml
 -    "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
+diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml
+index 45f4a71..516644c 100644
+--- a/vendor/libssh2-sys/Cargo.toml
++++ b/vendor/libssh2-sys/Cargo.toml
 @@ -43,16 +43,8 @@ version = "1.0.25"
  version = "0.3.11"
  
@@ -479,10 +471,10 @@ Index: rust/vendor/libssh2-sys/Cargo.toml
 -[target."cfg(windows)".dependencies.openssl-sys]
 -version = "0.9.35"
 -optional = true
-Index: rust/vendor/libz-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/libz-sys/Cargo.toml
-+++ rust/vendor/libz-sys/Cargo.toml
+diff --git a/vendor/libz-sys/Cargo.toml b/vendor/libz-sys/Cargo.toml
+index f7414d5..ee1163c 100644
+--- a/vendor/libz-sys/Cargo.toml
++++ b/vendor/libz-sys/Cargo.toml
 @@ -65,6 +65,3 @@ zlib-ng = [
      "libc",
      "cmake",
@@ -490,10 +482,10 @@ Index: rust/vendor/libz-sys/Cargo.toml
 -
 -[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
+diff --git a/vendor/mio/Cargo.toml b/vendor/mio/Cargo.toml
+index 42e28d0..b689d7b 100644
+--- a/vendor/mio/Cargo.toml
++++ b/vendor/mio/Cargo.toml
 @@ -102,8 +102,6 @@ default = ["log"]
  net = []
  os-ext = [
@@ -516,10 +508,10 @@ Index: rust/vendor/mio/Cargo.toml
 -    "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
+diff --git a/vendor/native-tls/Cargo.toml b/vendor/native-tls/Cargo.toml
+index a059236..d36b44b 100644
+--- a/vendor/native-tls/Cargo.toml
++++ b/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]
@@ -527,10 +519,10 @@ Index: rust/vendor/native-tls/Cargo.toml
 -
 -[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
+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
 @@ -45,13 +45,3 @@ version = "1.0.39"
  
  [features]
@@ -545,10 +537,10 @@ Index: rust/vendor/nu-ansi-term/Cargo.toml
 -    "handleapi",
 -    "processenv",
 -]
-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
+diff --git a/vendor/opener-0.5.2/Cargo.toml b/vendor/opener-0.5.2/Cargo.toml
+index 8d91b5e..2d7313b 100644
+--- a/vendor/opener-0.5.2/Cargo.toml
++++ b/vendor/opener-0.5.2/Cargo.toml
 @@ -32,10 +32,6 @@ version = "0.9"
  [target."cfg(target_os = \"linux\")".dependencies.bstr]
  version = "1"
@@ -560,10 +552,10 @@ Index: rust/vendor/opener-0.5.2/Cargo.toml
  [badges.appveyor]
  branch = "master"
  repository = "Seeker14491/opener"
-Index: rust/vendor/opener/Cargo.toml
-===================================================================
---- rust.orig/vendor/opener/Cargo.toml
-+++ rust/vendor/opener/Cargo.toml
+diff --git a/vendor/opener/Cargo.toml b/vendor/opener/Cargo.toml
+index 79b4be9..69cc269 100644
+--- a/vendor/opener/Cargo.toml
++++ b/vendor/opener/Cargo.toml
 @@ -40,8 +40,6 @@ version = "0.9"
  reveal = [
      "dep:url",
@@ -587,10 +579,10 @@ Index: rust/vendor/opener/Cargo.toml
  [badges.appveyor]
  branch = "master"
  repository = "Seeker14491/opener"
-Index: rust/vendor/os_info/Cargo.toml
-===================================================================
---- rust.orig/vendor/os_info/Cargo.toml
-+++ rust/vendor/os_info/Cargo.toml
+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
 @@ -48,18 +48,3 @@ version = "1"
  
  [features]
@@ -610,10 +602,10 @@ Index: rust/vendor/os_info/Cargo.toml
 -    "winerror",
 -    "winreg",
 -]
-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
+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
 @@ -60,15 +60,3 @@ version = "0.2.8"
  
  [target."cfg(unix)".dependencies.libc]
@@ -630,10 +622,10 @@ Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml
 -    "errhandlingapi",
 -    "handleapi",
 -]
-Index: rust/vendor/parking_lot_core/Cargo.toml
-===================================================================
---- rust.orig/vendor/parking_lot_core/Cargo.toml
-+++ rust/vendor/parking_lot_core/Cargo.toml
+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
 @@ -57,6 +57,3 @@ version = "0.3"
  
  [target."cfg(unix)".dependencies.libc]
@@ -641,10 +633,10 @@ Index: rust/vendor/parking_lot_core/Cargo.toml
 -
 -[target."cfg(windows)".dependencies.windows-targets]
 -version = "0.48.0"
-Index: rust/vendor/reqwest/Cargo.toml
-===================================================================
---- rust.orig/vendor/reqwest/Cargo.toml
-+++ rust/vendor/reqwest/Cargo.toml
+diff --git a/vendor/reqwest/Cargo.toml b/vendor/reqwest/Cargo.toml
+index bca6039..c735e2f 100644
+--- a/vendor/reqwest/Cargo.toml
++++ b/vendor/reqwest/Cargo.toml
 @@ -443,6 +443,3 @@ features = ["serde-serialize"]
  
  [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
@@ -652,31 +644,11 @@ Index: rust/vendor/reqwest/Cargo.toml
 -
 -[target."cfg(windows)".dependencies.winreg]
 -version = "0.10"
-Index: rust/vendor/rustix-0.37.6/Cargo.toml
-===================================================================
---- rust.orig/vendor/rustix-0.37.6/Cargo.toml
-+++ rust/vendor/rustix-0.37.6/Cargo.toml
-@@ -232,15 +232,3 @@ package = "errno"
- [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell]
- version = "1.5.2"
- optional = true
--
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
--features = [
--    "Win32_Foundation",
--    "Win32_Networking_WinSock",
--    "Win32_NetworkManagement_IpHelper",
--    "Win32_System_Threading",
--]
--
--[target."cfg(windows)".dev-dependencies.ctor]
--version = "0.1.21"
-Index: rust/vendor/rustix/Cargo.toml
-===================================================================
---- rust.orig/vendor/rustix/Cargo.toml
-+++ rust/vendor/rustix/Cargo.toml
-@@ -249,20 +249,3 @@ package = "errno"
+diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml
+index 78cdf49..37249c3 100644
+--- a/vendor/rustix/Cargo.toml
++++ b/vendor/rustix/Cargo.toml
+@@ -252,20 +252,3 @@ package = "errno"
  [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell]
  version = "1.5.2"
  optional = true
@@ -697,20 +669,20 @@ Index: rust/vendor/rustix/Cargo.toml
 -
 -[target."cfg(windows)".dev-dependencies.ctor]
 -version = "0.2.0"
-Index: rust/vendor/same-file/Cargo.toml
-===================================================================
---- rust.orig/vendor/same-file/Cargo.toml
-+++ rust/vendor/same-file/Cargo.toml
+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
 @@ -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"
-Index: rust/vendor/snapbox/Cargo.toml
-===================================================================
---- rust.orig/vendor/snapbox/Cargo.toml
-+++ rust/vendor/snapbox/Cargo.toml
+diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml
+index 2cb92d6..52e12d2 100644
+--- a/vendor/snapbox/Cargo.toml
++++ b/vendor/snapbox/Cargo.toml
 @@ -161,7 +161,6 @@ cmd = [
      "dep:os_pipe",
      "dep:wait-timeout",
@@ -728,10 +700,10 @@ Index: rust/vendor/snapbox/Cargo.toml
 -version = "0.48.0"
 -features = ["Win32_Foundation"]
 -optional = true
-Index: rust/vendor/socket2/Cargo.toml
-===================================================================
---- rust.orig/vendor/socket2/Cargo.toml
-+++ rust/vendor/socket2/Cargo.toml
+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
 @@ -58,11 +58,3 @@ all = []
  
  [target."cfg(unix)".dependencies.libc]
@@ -744,10 +716,10 @@ Index: rust/vendor/socket2/Cargo.toml
 -    "ws2ipdef",
 -    "ws2tcpip",
 -]
-Index: rust/vendor/stacker/Cargo.toml
-===================================================================
---- rust.orig/vendor/stacker/Cargo.toml
-+++ rust/vendor/stacker/Cargo.toml
+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
 @@ -43,13 +43,3 @@ version = "0.1.7"
  
  [build-dependencies.cc]
@@ -762,10 +734,10 @@ Index: rust/vendor/stacker/Cargo.toml
 -    "processthreadsapi",
 -    "minwindef",
 -]
-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
+diff --git a/vendor/sysinfo-0.26.7/Cargo.toml b/vendor/sysinfo-0.26.7/Cargo.toml
+index f8719a4..deb2e40 100644
+--- a/vendor/sysinfo-0.26.7/Cargo.toml
++++ b/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]
@@ -808,10 +780,10 @@ Index: rust/vendor/sysinfo-0.26.7/Cargo.toml
 -    "shellapi",
 -    "std",
 -]
-Index: rust/vendor/sysinfo/Cargo.toml
-===================================================================
---- rust.orig/vendor/sysinfo/Cargo.toml
-+++ rust/vendor/sysinfo/Cargo.toml
+diff --git a/vendor/sysinfo/Cargo.toml b/vendor/sysinfo/Cargo.toml
+index 2a21a72..d526f46 100644
+--- a/vendor/sysinfo/Cargo.toml
++++ b/vendor/sysinfo/Cargo.toml
 @@ -75,44 +75,3 @@ version = "1.0"
  
  [target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc]
@@ -857,14 +829,14 @@ Index: rust/vendor/sysinfo/Cargo.toml
 -    "winsock2",
 -    "sddl",
 -]
-Index: rust/vendor/tempfile/Cargo.toml
-===================================================================
---- rust.orig/vendor/tempfile/Cargo.toml
-+++ rust/vendor/tempfile/Cargo.toml
+diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml
+index 84ea801..bd37853 100644
+--- a/vendor/tempfile/Cargo.toml
++++ b/vendor/tempfile/Cargo.toml
 @@ -50,10 +50,3 @@ features = ["fs"]
  
  [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
- version = "0.3"
+ version = "0.4"
 -
 -[target."cfg(windows)".dependencies.windows-sys]
 -version = "0.48"
@@ -872,10 +844,10 @@ Index: rust/vendor/tempfile/Cargo.toml
 -    "Win32_Storage_FileSystem",
 -    "Win32_Foundation",
 -]
-Index: rust/vendor/term/Cargo.toml
-===================================================================
---- rust.orig/vendor/term/Cargo.toml
-+++ rust/vendor/term/Cargo.toml
+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
 @@ -28,12 +28,6 @@ version = "2"
  
  [features]
@@ -889,10 +861,10 @@ Index: rust/vendor/term/Cargo.toml
  [badges.appveyor]
  repository = "Stebalien/term"
  
-Index: rust/vendor/termcolor/Cargo.toml
-===================================================================
---- rust.orig/vendor/termcolor/Cargo.toml
-+++ rust/vendor/termcolor/Cargo.toml
+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
 @@ -35,6 +35,3 @@ name = "termcolor"
  bench = false
  
@@ -900,11 +872,11 @@ Index: rust/vendor/termcolor/Cargo.toml
 -
 -[target."cfg(windows)".dependencies.winapi-util]
 -version = "0.1.3"
-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
+diff --git a/vendor/terminal_size/Cargo.toml b/vendor/terminal_size/Cargo.toml
+index f810025..0fbe3a1 100644
+--- a/vendor/terminal_size/Cargo.toml
++++ b/vendor/terminal_size/Cargo.toml
+@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size"
  [target."cfg(not(windows))".dependencies.rustix]
  version = "0.38.0"
  features = ["termios"]
@@ -915,10 +887,10 @@ Index: rust/vendor/terminal_size/Cargo.toml
 -    "Win32_Foundation",
 -    "Win32_System_Console",
 -]
-Index: rust/vendor/termize/Cargo.toml
-===================================================================
---- rust.orig/vendor/termize/Cargo.toml
-+++ rust/vendor/termize/Cargo.toml
+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
 @@ -49,8 +49,5 @@ rpath = false
  [dependencies]
  [target."cfg(unix)".dependencies.libc]
@@ -928,10 +900,10 @@ Index: rust/vendor/termize/Cargo.toml
 -features = ["handleapi", "processenv", "wincon", "winbase"]
  [badges.cirrus-ci]
  repository = "JohnTitor/termize"
-Index: rust/vendor/tokio-native-tls/Cargo.toml
-===================================================================
---- rust.orig/vendor/tokio-native-tls/Cargo.toml
-+++ rust/vendor/tokio-native-tls/Cargo.toml
+diff --git a/vendor/tokio-native-tls/Cargo.toml b/vendor/tokio-native-tls/Cargo.toml
+index 76be3d3..3ada811 100644
+--- a/vendor/tokio-native-tls/Cargo.toml
++++ b/vendor/tokio-native-tls/Cargo.toml
 @@ -76,20 +76,3 @@ version = "0.10"
  
  [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework]
@@ -953,10 +925,10 @@ Index: rust/vendor/tokio-native-tls/Cargo.toml
 -    "wincrypt",
 -    "winerror",
 -]
-Index: rust/vendor/tokio/Cargo.toml
-===================================================================
---- rust.orig/vendor/tokio/Cargo.toml
-+++ rust/vendor/tokio/Cargo.toml
+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
 @@ -122,11 +122,6 @@ net = [
      "mio/os-ext",
      "mio/net",
@@ -1003,10 +975,10 @@ Index: rust/vendor/tokio/Cargo.toml
 -    "Win32_Foundation",
 -    "Win32_Security_Authorization",
 -]
-Index: rust/vendor/uuid/Cargo.toml
-===================================================================
---- rust.orig/vendor/uuid/Cargo.toml
-+++ rust/vendor/uuid/Cargo.toml
+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
 @@ -185,10 +185,6 @@ version = "0.3"
  version = "0.2"
  package = "wasm-bindgen"
@@ -1018,10 +990,10 @@ Index: rust/vendor/uuid/Cargo.toml
  [badges.is-it-maintained-issue-resolution]
  repository = "uuid-rs/uuid"
  
-Index: rust/vendor/walkdir/Cargo.toml
-===================================================================
---- rust.orig/vendor/walkdir/Cargo.toml
-+++ rust/vendor/walkdir/Cargo.toml
+diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml
+index 4c29a20..725e320 100644
+--- a/vendor/walkdir/Cargo.toml
++++ b/vendor/walkdir/Cargo.toml
 @@ -39,9 +39,6 @@ version = "1.0.1"
  [dev-dependencies.doc-comment]
  version = "0.3"
@@ -1032,10 +1004,10 @@ Index: rust/vendor/walkdir/Cargo.toml
  [badges.appveyor]
  repository = "BurntSushi/walkdir"
  
-Index: rust/vendor/yansi-term/Cargo.toml
-===================================================================
---- rust.orig/vendor/yansi-term/Cargo.toml
-+++ rust/vendor/yansi-term/Cargo.toml
+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
 @@ -36,9 +36,6 @@ version = "1.0"
  
  [features]
diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch
index b02bcfafc..36065ace9 100644
--- a/debian/patches/d-armel-fix-lldb.patch
+++ b/debian/patches/d-armel-fix-lldb.patch
@@ -1,10 +1,10 @@
 run panics if lldb is not installed and no output is produced..
 
-Index: rust/src/bootstrap/test.rs
+Index: rust/src/bootstrap/src/core/build_steps/test.rs
 ===================================================================
---- rust.orig/src/bootstrap/test.rs
-+++ rust/src/bootstrap/test.rs
-@@ -1631,7 +1631,11 @@ note: if you're sure you want to do this
+--- rust.orig/src/bootstrap/src/core/build_steps/test.rs
++++ rust/src/bootstrap/src/core/build_steps/test.rs
+@@ -1779,7 +1779,11 @@ NOTE: if you're sure you want to do this
              .ok();
          if let Some(ref vers) = lldb_version {
              cmd.arg("--lldb-version").arg(vers);
diff --git a/debian/patches/d-bootstrap-cargo-check-cfg.patch b/debian/patches/d-bootstrap-cargo-check-cfg.patch
deleted file mode 100644
index eab9c456b..000000000
--- a/debian/patches/d-bootstrap-cargo-check-cfg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-our cargo doesn't know about the 'output' part yet, this patch can be dropped
-with cargo >= 0.64
-
-Index: rust/src/bootstrap/builder.rs
-===================================================================
---- rust.orig/src/bootstrap/builder.rs
-+++ rust/src/bootstrap/builder.rs
-@@ -1358,9 +1358,9 @@ impl<'a> Builder<'a> {
-         // complete list of features, so for that reason we don't enable checking of
-         // features for std crates.
-         cargo.arg(if mode != Mode::Std {
--            "-Zcheck-cfg=names,values,output,features"
-+            "-Zcheck-cfg=names,values,features"
-         } else {
--            "-Zcheck-cfg=names,values,output"
-+            "-Zcheck-cfg=names,values"
-         });
- 
-         // Add extra cfg not defined in/by rustc
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
index 39f246be1..581c83e83 100644
--- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch
+++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
@@ -4,15 +4,15 @@ Subject: d-bootstrap-custom-debuginfo-path
 
 ===================================================================
 ---
- src/bootstrap/lib.rs                                        | 5 ++---
+ src/bootstrap/src/lib.rs                                        | 5 ++---
  src/test/codegen/remap_path_prefix/issue-73167-remap-std.rs | 2 +-
  2 files changed, 3 insertions(+), 4 deletions(-)
 
-Index: rust/src/bootstrap/lib.rs
+Index: rust/src/bootstrap/src/lib.rs
 ===================================================================
---- rust.orig/src/bootstrap/lib.rs
-+++ rust/src/bootstrap/lib.rs
-@@ -1145,10 +1145,9 @@ impl Build {
+--- rust.orig/src/bootstrap/src/lib.rs
++++ rust/src/bootstrap/src/lib.rs
+@@ -1163,10 +1163,9 @@ impl Build {
  
          match which {
              GitRepo::Rustc => {
@@ -38,3 +38,17 @@ Index: rust/tests/codegen/remap_path_prefix/issue-73167-remap-std.rs
  fn main() {
      std::thread::spawn(|| {
          println!("hello");
+Index: rust/src/bootstrap/src/core/builder.rs
+===================================================================
+--- rust.orig/src/bootstrap/src/core/builder.rs
++++ rust/src/bootstrap/src/core/builder.rs
+@@ -1775,7 +1775,8 @@ impl<'a> Builder<'a> {
+             cargo.env("CFG_VIRTUAL_RUST_SOURCE_BASE_DIR", map_to);
+         }
+ 
+-        if self.config.rust_remap_debuginfo {
++	// Debian: this breaks with our vendored sources!
++        if false && self.config.rust_remap_debuginfo {
+             // FIXME: handle vendored sources
+             let registry_src = t!(home::cargo_home()).join("registry").join("src");
+             let mut env_var = OsString::new();
diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch
index 4cd8bc1cd..bd2c75946 100644
--- a/debian/patches/d-bootstrap-disable-git.patch
+++ b/debian/patches/d-bootstrap-disable-git.patch
@@ -10,11 +10,11 @@ Forwarded: not-needed
  src/bootstrap/dist.rs    | 5 ++++-
  2 files changed, 9 insertions(+), 2 deletions(-)
 
-Index: rust/src/bootstrap/channel.rs
+Index: rust/src/bootstrap/src/utils/channel.rs
 ===================================================================
---- rust.orig/src/bootstrap/channel.rs
-+++ rust/src/bootstrap/channel.rs
-@@ -36,6 +36,12 @@ pub struct Info {
+--- rust.orig/src/bootstrap/src/utils/channel.rs
++++ rust/src/bootstrap/src/utils/channel.rs
+@@ -35,6 +35,12 @@ pub struct Info {
  
  impl GitInfo {
      pub fn new(omit_git_hash: bool, dir: &Path) -> GitInfo {
@@ -27,19 +27,20 @@ Index: rust/src/bootstrap/channel.rs
          // See if this even begins to look like a git dir
          if !dir.join(".git").exists() {
              match read_commit_info_file(dir) {
-Index: rust/src/bootstrap/dist.rs
+Index: rust/src/bootstrap/src/core/build_steps/dist.rs
 ===================================================================
---- rust.orig/src/bootstrap/dist.rs
-+++ rust/src/bootstrap/dist.rs
-@@ -997,7 +997,10 @@ impl Step for PlainSourceTarball {
-         }
+--- rust.orig/src/bootstrap/src/core/build_steps/dist.rs
++++ rust/src/bootstrap/src/core/build_steps/dist.rs
+@@ -991,8 +991,10 @@ impl Step for PlainSourceTarball {
  
-         // If we're building from git sources, we need to vendor a complete distribution.
--        if builder.rust_info().is_managed_git_subrepository() {
+         // If we're building from git or tarball sources, we need to vendor
+         // a complete distribution.
+-        if builder.rust_info().is_managed_git_subrepository()
+-            || builder.rust_info().is_from_tarball()
 +        //
 +        // Debian: short-circuited because the Debian package is also in a git
 +        //         repository, but cargo-vendor should not be installed or run.
-+        if false && builder.rust_info().is_managed_git_subrepository() {
-             // Ensure we have the submodules checked out.
-             builder.update_submodule(Path::new("src/tools/cargo"));
-             builder.update_submodule(Path::new("src/tools/rust-analyzer"));
++        if false
+         {
+             if builder.rust_info().is_managed_git_subrepository() {
+                 // Ensure we have the submodules checked out.
diff --git a/debian/patches/d-bootstrap-no-assume-tools.patch b/debian/patches/d-bootstrap-no-assume-tools.patch
index 0d9ff8973..0bc6921dd 100644
--- a/debian/patches/d-bootstrap-no-assume-tools.patch
+++ b/debian/patches/d-bootstrap-no-assume-tools.patch
@@ -7,11 +7,11 @@ Subject: d-bootstrap-no-assume-tools
  src/bootstrap/builder/tests.rs | 4 ++++
  1 file changed, 4 insertions(+)
 
-Index: rust/src/bootstrap/builder/tests.rs
+Index: rust/src/bootstrap/src/tests/builder.rs
 ===================================================================
---- rust.orig/src/bootstrap/builder/tests.rs
-+++ rust/src/bootstrap/builder/tests.rs
-@@ -387,9 +387,13 @@ mod dist {
+--- rust.orig/src/bootstrap/src/tests/builder.rs
++++ rust/src/bootstrap/src/tests/builder.rs
+@@ -390,9 +390,13 @@ mod dist {
      #[test]
      fn dist_only_cross_host() {
          let b = TargetSelection::from_user("B");
diff --git a/debian/patches/d-bootstrap-permit-symlink-in-docs.patch b/debian/patches/d-bootstrap-permit-symlink-in-docs.patch
index 9f088a228..d170c709c 100644
--- a/debian/patches/d-bootstrap-permit-symlink-in-docs.patch
+++ b/debian/patches/d-bootstrap-permit-symlink-in-docs.patch
@@ -1,10 +1,10 @@
 partial revert of b9eedea4b0368fd1f00f204db75109ff444fab5b upstream
 
-Index: rust/src/bootstrap/dist.rs
+Index: rust/src/bootstrap/src/core/build_steps/dist.rs
 ===================================================================
---- rust.orig/src/bootstrap/dist.rs
-+++ rust/src/bootstrap/dist.rs
-@@ -81,6 +81,7 @@ impl Step for Docs {
+--- rust.orig/src/bootstrap/src/core/build_steps/dist.rs
++++ rust/src/bootstrap/src/core/build_steps/dist.rs
+@@ -79,6 +79,7 @@ impl Step for Docs {
          tarball.set_product_name("Rust Documentation");
          tarball.add_bulk_dir(&builder.doc_out(host), dest);
          tarball.add_file(&builder.src.join("src/doc/robots.txt"), dest, 0o644);
diff --git a/debian/patches/d-bootstrap-rustflags.patch b/debian/patches/d-bootstrap-rustflags.patch
index 792b05c82..98edfc568 100644
--- a/debian/patches/d-bootstrap-rustflags.patch
+++ b/debian/patches/d-bootstrap-rustflags.patch
@@ -4,15 +4,15 @@ Subject: d-bootstrap-rustflags
 
 ===================================================================
 ---
- src/bootstrap/builder.rs | 12 ++++++++++++
+ src/bootstrap/src/core/builder.rs | 12 ++++++++++++
  1 file changed, 12 insertions(+)
 
-Index: rust/src/bootstrap/builder.rs
+Index: rust/src/bootstrap/src/core/builder.rs
 ===================================================================
---- rust.orig/src/bootstrap/builder.rs
-+++ rust/src/bootstrap/builder.rs
-@@ -1385,6 +1385,18 @@ impl<'a> Builder<'a> {
-             }
+--- rust.orig/src/bootstrap/src/core/builder.rs
++++ rust/src/bootstrap/src/core/builder.rs
+@@ -1447,6 +1447,18 @@ impl<'a> Builder<'a> {
+             hostflags.arg("--check-cfg=values(bootstrap)");
          }
  
 +        // Debian-specific stuff here
diff --git a/debian/patches/d-bootstrap-use-local-css.patch b/debian/patches/d-bootstrap-use-local-css.patch
index 080cc9b85..33d05603b 100644
--- a/debian/patches/d-bootstrap-use-local-css.patch
+++ b/debian/patches/d-bootstrap-use-local-css.patch
@@ -4,14 +4,14 @@ Subject: d-bootstrap-use-local-css
 
 ===================================================================
 ---
- src/bootstrap/doc.rs | 15 ++++-----------
+ src/bootstrap/src/core/build_steps/doc.rs | 15 ++++-----------
  1 file changed, 4 insertions(+), 11 deletions(-)
 
-Index: rust/src/bootstrap/doc.rs
+Index: rust/src/bootstrap/src/core/build_steps/doc.rs
 ===================================================================
---- rust.orig/src/bootstrap/doc.rs
-+++ rust/src/bootstrap/doc.rs
-@@ -350,7 +350,27 @@ impl Step for Standalone {
+--- rust.orig/src/bootstrap/src/core/build_steps/doc.rs
++++ rust/src/bootstrap/src/core/build_steps/doc.rs
+@@ -362,7 +362,27 @@ impl Step for Standalone {
                  .arg("--index-page")
                  .arg(&builder.src.join("src/doc/index.md"))
                  .arg("--markdown-playground-url")
@@ -40,7 +40,7 @@ Index: rust/src/bootstrap/doc.rs
                  .arg("-o")
                  .arg(&out)
                  .arg(&path);
-@@ -359,11 +379,6 @@ impl Step for Standalone {
+@@ -371,11 +391,6 @@ impl Step for Standalone {
                  cmd.arg("--disable-minification");
              }
  
diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch
index 1e9f272f1..48458cca2 100644
--- a/debian/patches/d-disable-download-tests.patch
+++ b/debian/patches/d-disable-download-tests.patch
@@ -1,18 +1,18 @@
-Index: rust/src/bootstrap/config/tests.rs
+Index: rust/src/bootstrap/src/tests/config.rs
 ===================================================================
---- rust.orig/src/bootstrap/config/tests.rs
-+++ rust/src/bootstrap/config/tests.rs
-@@ -13,6 +13,9 @@ fn parse(config: &str) -> Config {
+--- rust.orig/src/bootstrap/src/tests/config.rs
++++ rust/src/bootstrap/src/tests/config.rs
+@@ -18,6 +18,9 @@ fn parse(config: &str) -> Config {
  
  #[test]
  fn download_ci_llvm() {
 +    // Debian: this will attempt to download LLVM
 +    return;
 +
-     if crate::llvm::is_ci_llvm_modified(&parse("")) {
+     if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) {
          eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
          return;
-@@ -41,7 +44,11 @@ fn download_ci_llvm() {
+@@ -46,6 +49,9 @@ fn download_ci_llvm() {
  //   - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487
  #[test]
  fn detect_src_and_out() {
@@ -20,7 +20,5 @@ Index: rust/src/bootstrap/config/tests.rs
 +    return;
 +
      fn test(cfg: Config, build_dir: Option<&str>) {
-+
          // This will bring absolute form of `src/bootstrap` path
          let current_dir = std::env::current_dir().unwrap();
- 
diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch
deleted file mode 100644
index 4ac594d0d..000000000
--- a/debian/patches/d-fix-rustix-outline.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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-0.37.6/build.rs
-===================================================================
---- rust.orig/vendor/rustix-0.37.6/build.rs
-+++ rust/vendor/rustix-0.37.6/build.rs
-@@ -1,4 +1,3 @@
--#[cfg(feature = "cc")]
- use cc::Build;
- use std::env::var;
- use std::io::Write;
-@@ -158,16 +157,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.6/Cargo.toml
-===================================================================
---- rust.orig/vendor/rustix-0.37.6/Cargo.toml
-+++ rust/vendor/rustix-0.37.6/Cargo.toml
-@@ -127,7 +127,6 @@ version = "3.4.0"
- 
- [build-dependencies.cc]
- version = "1.0.68"
--optional = true
- 
- [features]
- all-apis = [
diff --git a/debian/patches/d-rustc-i686-baseline.patch b/debian/patches/d-rustc-i686-baseline.patch
index bc1e55d91..e00dc112c 100644
--- a/debian/patches/d-rustc-i686-baseline.patch
+++ b/debian/patches/d-rustc-i686-baseline.patch
@@ -4,17 +4,17 @@ Subject: d-rustc-i686-baseline
 
 ===================================================================
 ---
- compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs | 2 +-
+ compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-Index: rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
+Index: rust/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
 ===================================================================
---- rust.orig/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-+++ rust/compiler/rustc_target/src/spec/i686_unknown_linux_gnu.rs
-@@ -2,7 +2,7 @@ use crate::spec::{Cc, LinkerFlavor, Lld,
+--- rust.orig/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
++++ rust/compiler/rustc_target/src/spec/targets/i686_unknown_linux_gnu.rs
+@@ -2,7 +2,7 @@ use crate::spec::{base, Cc, LinkerFlavor
  
  pub fn target() -> Target {
-     let mut base = super::linux_gnu_base::opts();
+     let mut base = base::linux_gnu::opts();
 -    base.cpu = "pentium4".into();
 +    base.cpu = "pentiumpro".into();
      base.max_atomic_width = Some(64);
diff --git a/debian/patches/d-rustc-windows-ssp.patch b/debian/patches/d-rustc-windows-ssp.patch
index 46b20fb97..b086b9a5d 100644
--- a/debian/patches/d-rustc-windows-ssp.patch
+++ b/debian/patches/d-rustc-windows-ssp.patch
@@ -4,14 +4,14 @@ Subject: d-rustc-windows-ssp
 
 Bug: https://github.com/rust-lang/rust/issues/68973
 ---
- compiler/rustc_target/src/spec/windows_gnu_base.rs | 2 ++
+ compiler/rustc_target/src/spec/base/windows_gnu.rs | 2 ++
  1 file changed, 2 insertions(+)
 
-Index: rust/compiler/rustc_target/src/spec/windows_gnu_base.rs
+Index: rust/compiler/rustc_target/src/spec/base/windows_gnu.rs
 ===================================================================
---- rust.orig/compiler/rustc_target/src/spec/windows_gnu_base.rs
-+++ rust/compiler/rustc_target/src/spec/windows_gnu_base.rs
-@@ -41,6 +41,8 @@ pub fn opts() -> TargetOptions {
+--- rust.orig/compiler/rustc_target/src/spec/base/windows_gnu.rs
++++ rust/compiler/rustc_target/src/spec/base/windows_gnu.rs
+@@ -42,6 +42,8 @@ pub fn opts() -> TargetOptions {
          "-lmsvcrt",
          "-luser32",
          "-lkernel32",
diff --git a/debian/patches/series b/debian/patches/series
index ca50b1c7f..2dfca26e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ c-0003-tests-add-missing-cross-disabled-checks.patch
 # pending, or forwarded
 u-reproducible-build.patch
 u-fix-get-toml-when-test.patch
-u-disable-fp-precision-test-on-i386.patch
 u-riscv-disable-unpacked-split-debuginfo.patch
 u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
 
@@ -21,7 +20,6 @@ u-rustc-llvm-cross-flags.patch
 #u-allow-system-compiler-rt.patch
 
 # Debian-specific patches, not suitable for upstream
-d-fix-rustix-outline.patch
 d-disable-download-tests.patch
 
 ## Patches needed by debian/prune-unused-deps, for building bootstrap
@@ -47,7 +45,6 @@ d-bootstrap-use-local-css.patch
 d-bootstrap-custom-debuginfo-path.patch
 d-bootstrap-permit-symlink-in-docs.patch
 d-test-ignore-avx-44056.patch
-d-bootstrap-cargo-check-cfg.patch
 d-armel-fix-lldb.patch
 
 # Work around for some porterboxes, keep this commented
diff --git a/debian/patches/u-disable-fp-precision-test-on-i386.patch b/debian/patches/u-disable-fp-precision-test-on-i386.patch
deleted file mode 100644
index d4845c9d0..000000000
--- a/debian/patches/u-disable-fp-precision-test-on-i386.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: liushuyu <liushuyu011@gmail.com>
-Date: Tue, 25 Jul 2023 09:48:12 +0800
-Subject: [PATCH] core library: Disable fpmath tests for i386 ...
-
-This patch disables the floating-point epsilon test for i386 since
-x87 registers are too imprecise and can't produce the expected
-results.
-
-Forwarded: https://github.com/rust-lang/rust/pull/114042
----
- library/core/src/num/f32.rs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rust/library/core/src/num/f32.rs
-===================================================================
---- rust.orig/library/core/src/num/f32.rs
-+++ rust/library/core/src/num/f32.rs
-@@ -800,7 +800,7 @@ impl f32 {
-     /// let angle = std::f32::consts::PI;
-     ///
-     /// let abs_difference = (angle.to_degrees() - 180.0).abs();
--    ///
-+    /// # #[cfg(not(target_arch = "x86"))]
-     /// assert!(abs_difference <= f32::EPSILON);
-     /// ```
-     #[must_use = "this returns the result of the operation, \
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch
index 1aff8de0f..09ba0552e 100644
--- a/debian/patches/u-fix-get-toml-when-test.patch
+++ b/debian/patches/u-fix-get-toml-when-test.patch
@@ -6,17 +6,16 @@ Bug: https://github.com/rust-lang/rust/issues/105766
 Last-Update: 2023-03-29
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/src/bootstrap/config.rs
+Index: rust/src/bootstrap/src/core/config/config.rs
 ===================================================================
---- rust.orig/src/bootstrap/config.rs
-+++ rust/src/bootstrap/config.rs
-@@ -1040,9 +1040,32 @@ impl Config {
+--- rust.orig/src/bootstrap/src/core/config/config.rs
++++ rust/src/bootstrap/src/core/config/config.rs
+@@ -1093,8 +1093,32 @@ impl Config {
  
      pub fn parse(args: &[String]) -> Config {
          #[cfg(test)]
 -        fn get_toml(_: &Path) -> TomlConfig {
 -            TomlConfig::default()
--        }
 +        fn get_toml(file: &Path) -> TomlConfig {
 +            // Debian: We use previous version as a custom rustc, which
 +            // unfortunately won't be picked up because config.toml isn't
@@ -42,7 +41,7 @@ Index: rust/src/bootstrap/config.rs
 +                .unwrap_or_else(|err| {
 +                    eprintln!("failed to parse TOML configuration '{}': {err}", file.display());
 +                    crate::detail_exit(2);
-+                })        }
++                })
+         }
  
          #[cfg(not(test))]
-         fn get_toml(file: &Path) -> TomlConfig {
diff --git a/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch b/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch
index c7dd9de9d..6ca345e86 100644
--- a/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch
+++ b/debian/patches/u-riscv-disable-unpacked-split-debuginfo.patch
@@ -1,140 +1,121 @@
-Description: explicitly disable split unpacked debuginfo for now on riscv64,
- it's broken and we don't want cargo to auto-enable it..
- https://github.com/llvm/llvm-project/issues/56642
- https://github.com/rust-lang/rust/issues/110224Z
+From 471af8c5a382229e57656798900406e1ec82c5c8 Mon Sep 17 00:00:00 2001
+From: kxxt <rsworktech@outlook.com>
+Date: Wed, 31 Jan 2024 09:02:18 +0800
+Subject: [PATCH] riscv only supports split_debuginfo=off for now
 
-Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_freebsd.rs
-@@ -1,4 +1,5 @@
--use crate::spec::{CodeModel, Target, TargetOptions};
-+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+Disable packed/unpacked options for riscv linux/android.
+Other riscv targets already only have the off option.
+
+The packed/unpacked options might be supported in the future.
+See upstream issue for more details:
+https://github.com/llvm/llvm-project/issues/56642
+
+Fixes #110224
+---
+ .../src/spec/targets/riscv32gc_unknown_linux_gnu.rs          | 5 ++++-
+ .../src/spec/targets/riscv32gc_unknown_linux_musl.rs         | 5 ++++-
+ .../rustc_target/src/spec/targets/riscv64_linux_android.rs   | 5 ++++-
+ .../src/spec/targets/riscv64gc_unknown_linux_gnu.rs          | 5 ++++-
+ .../src/spec/targets/riscv64gc_unknown_linux_musl.rs         | 5 ++++-
+ 5 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs
+index 06e8f1837637f..0be32cbd77165 100644
+--- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_gnu.rs
+@@ -1,4 +1,6 @@
+-use crate::spec::{base, CodeModel, Target, TargetOptions};
 +use std::borrow::Cow;
++
++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
  
  pub fn target() -> Target {
      Target {
-@@ -12,6 +13,7 @@ pub fn target() -> Target {
+@@ -12,6 +14,7 @@ pub fn target() -> Target {
              features: "+m,+a,+f,+d,+c".into(),
-             llvm_abiname: "lp64d".into(),
-             max_atomic_width: Some(64),
+             llvm_abiname: "ilp32d".into(),
+             max_atomic_width: Some(32),
 +            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..super::freebsd_base::opts()
+             ..base::linux_gnu::opts()
          },
      }
-Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_fuchsia.rs
-@@ -1,4 +1,5 @@
--use crate::spec::{CodeModel, SanitizerSet, Target, TargetOptions};
-+use crate::spec::{CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
+diff --git a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
+index 722703d2384fe..cfa9990dac9bd 100644
+--- a/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
++++ b/compiler/rustc_target/src/spec/targets/riscv32gc_unknown_linux_musl.rs
+@@ -1,4 +1,6 @@
+-use crate::spec::{base, CodeModel, Target, TargetOptions};
 +use std::borrow::Cow;
++
++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
  
  pub fn target() -> Target {
      Target {
-@@ -13,6 +14,7 @@ pub fn target() -> Target {
-             llvm_abiname: "lp64d".into(),
-             max_atomic_width: Some(64),
-             supported_sanitizers: SanitizerSet::SHADOWCALLSTACK,
+@@ -12,6 +14,7 @@ pub fn target() -> Target {
+             features: "+m,+a,+f,+d,+c".into(),
+             llvm_abiname: "ilp32d".into(),
+             max_atomic_width: Some(32),
 +            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..super::fuchsia_base::opts()
+             ..base::linux_musl::opts()
          },
      }
-Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_gnu.rs
-@@ -1,4 +1,5 @@
--use crate::spec::{CodeModel, Target, TargetOptions};
-+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+diff --git a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs
+index 40e447dbb8362..762197d7217c7 100644
+--- a/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs
++++ b/compiler/rustc_target/src/spec/targets/riscv64_linux_android.rs
+@@ -1,4 +1,6 @@
+-use crate::spec::{base, CodeModel, SanitizerSet, Target, TargetOptions};
 +use std::borrow::Cow;
++
++use crate::spec::{base, CodeModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
  
  pub fn target() -> Target {
      Target {
-@@ -12,6 +13,7 @@ pub fn target() -> Target {
-             features: "+m,+a,+f,+d,+c".into(),
+@@ -13,6 +15,7 @@ pub fn target() -> Target {
              llvm_abiname: "lp64d".into(),
+             supported_sanitizers: SanitizerSet::ADDRESS,
              max_atomic_width: Some(64),
 +            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..super::linux_gnu_base::opts()
+             ..base::android::opts()
          },
      }
-Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_linux_musl.rs
-@@ -1,4 +1,5 @@
--use crate::spec::{CodeModel, Target, TargetOptions};
-+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs
+index c0969d4e11eb9..e71929a190479 100644
+--- a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs
++++ b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_gnu.rs
+@@ -1,4 +1,6 @@
+-use crate::spec::{base, CodeModel, Target, TargetOptions};
 +use std::borrow::Cow;
++
++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
  
  pub fn target() -> Target {
      Target {
-@@ -12,6 +13,7 @@ pub fn target() -> Target {
+@@ -12,6 +14,7 @@ pub fn target() -> Target {
              features: "+m,+a,+f,+d,+c".into(),
              llvm_abiname: "lp64d".into(),
              max_atomic_width: Some(64),
 +            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..super::linux_musl_base::opts()
-         },
-     }
-Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_none_elf.rs
-@@ -1,5 +1,6 @@
- use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
--use crate::spec::{RelocModel, Target, TargetOptions};
-+use crate::spec::{RelocModel, SplitDebuginfo, Target, TargetOptions};
-+use std::borrow::Cow;
- 
- use super::SanitizerSet;
- 
-@@ -23,6 +24,7 @@ pub fn target() -> Target {
-             emit_debug_gdb_scripts: false,
-             eh_frame_header: false,
-             supported_sanitizers: SanitizerSet::KERNELADDRESS,
-+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..Default::default()
+             ..base::linux_gnu::opts()
          },
      }
-Index: rust/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64gc_unknown_openbsd.rs
-@@ -1,4 +1,5 @@
--use crate::spec::{CodeModel, Target, TargetOptions};
-+use crate::spec::{CodeModel, SplitDebuginfo, Target, TargetOptions};
+diff --git a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs
+index 656e260d094d8..8ea28d6b162cc 100644
+--- a/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs
++++ b/compiler/rustc_target/src/spec/targets/riscv64gc_unknown_linux_musl.rs
+@@ -1,4 +1,6 @@
+-use crate::spec::{base, CodeModel, Target, TargetOptions};
 +use std::borrow::Cow;
++
++use crate::spec::{base, CodeModel, SplitDebuginfo, Target, TargetOptions};
  
  pub fn target() -> Target {
      Target {
-@@ -12,6 +13,7 @@ pub fn target() -> Target {
+@@ -12,6 +14,7 @@ pub fn target() -> Target {
              features: "+m,+a,+f,+d,+c".into(),
              llvm_abiname: "lp64d".into(),
              max_atomic_width: Some(64),
 +            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..super::openbsd_base::opts()
-         },
-     }
-Index: rust/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
-+++ rust/compiler/rustc_target/src/spec/riscv64imac_unknown_none_elf.rs
-@@ -1,5 +1,6 @@
- use crate::spec::{Cc, CodeModel, LinkerFlavor, Lld, PanicStrategy};
--use crate::spec::{RelocModel, SanitizerSet, Target, TargetOptions};
-+use crate::spec::{RelocModel, SanitizerSet, SplitDebuginfo, Target, TargetOptions};
-+use std::borrow::Cow;
- 
- pub fn target() -> Target {
-     Target {
-@@ -20,6 +21,7 @@ pub fn target() -> Target {
-             emit_debug_gdb_scripts: false,
-             eh_frame_header: false,
-             supported_sanitizers: SanitizerSet::KERNELADDRESS,
-+            supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
-             ..Default::default()
+             ..base::linux_musl::opts()
          },
      }