30 files changed, 416 insertions, 604 deletions
diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch
index 8fe7c1ca9..192571e46 100644
--- a/debian/patches/c-update-libgit2.patch
+++ b/debian/patches/c-update-libgit2.patch
@@ -10,10 +10,10 @@ Index: rust/src/tools/cargo/Cargo.toml
 -git2-curl = "0.18.0"
 +git2 = "0.18"
 +git2-curl = "0.19.0"
- gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
- gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
+ 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"
-@@ -53,7 +53,7 @@ jobserver = "0.1.26"
+@@ -52,7 +52,7 @@ jobserver = "0.1.26"
  lazy_static = "1.3.0"
  lazycell = "1.2.0"
  libc = "0.2.144"
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index e90237fa8..1cea0a8bf 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -3,18 +3,18 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100
 Subject: d-0000-ignore-removed-submodules
 
 ---
- Cargo.toml                         | 11 +++-----
- src/bootstrap/bootstrap.py         |  4 ---
+ Cargo.toml                         |  7 -----
+ src/bootstrap/bootstrap.py         |  6 +----
  src/bootstrap/builder.rs           | 54 +++++++++-----------------------------
  src/bootstrap/test.rs              | 12 +--------
  src/tools/rust-analyzer/Cargo.toml | 11 +++++++-
- 5 files changed, 28 insertions(+), 64 deletions(-)
+ 5 files changed, 25 insertions(+), 65 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index 8eb378a..70487ec 100644
+index 20b1c65..16d4ebe 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -18,22 +18,15 @@ members = [
+@@ -20,22 +20,15 @@ members = [
    "src/tools/tidy",
    "src/tools/tier-check",
    "src/tools/build-manifest",
@@ -38,13 +38,13 @@ index 8eb378a..70487ec 100644
    "src/tools/lld-wrapper",
    "src/tools/collect-license-metadata",
 diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index 58d1926..527282d 100644
+index 149350e..2813c89 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -899,10 +899,6 @@ class RustBuild(object):
+@@ -946,10 +946,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(verbose_count))
+         args.extend("--verbose" for _ in range(self.verbose))
 -        if self.use_locked_deps:
 -            args.append("--locked")
 -        if self.use_vendored_sources:
@@ -53,10 +53,10 @@ index 58d1926..527282d 100644
              args.append("--features")
              args.append("build-metrics")
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 2fa4455..3f3e5ec 100644
+index 05b66f9..ff1f0eb 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -492,20 +492,20 @@ impl<'a> ShouldRun<'a> {
+@@ -459,20 +459,20 @@ impl<'a> ShouldRun<'a> {
          static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new();
  
          let init_submodules_paths = |src: &PathBuf| {
@@ -89,7 +89,7 @@ index 2fa4455..3f3e5ec 100644
  
              submodules_paths
          };
-@@ -672,25 +672,14 @@ impl<'a> Builder<'a> {
+@@ -646,25 +646,14 @@ impl<'a> Builder<'a> {
                  tool::Linkchecker,
                  tool::CargoTest,
                  tool::Compiletest,
@@ -115,7 +115,7 @@ index 2fa4455..3f3e5ec 100644
              ),
              Kind::Check | Kind::Clippy | Kind::Fix => describe!(
                  check::Std,
-@@ -698,11 +687,6 @@ impl<'a> Builder<'a> {
+@@ -672,12 +661,7 @@ impl<'a> Builder<'a> {
                  check::Rustdoc,
                  check::CodegenBackend,
                  check::Clippy,
@@ -123,11 +123,12 @@ index 2fa4455..3f3e5ec 100644
 -                check::CargoMiri,
 -                check::MiroptTestTools,
 -                check::Rls,
--                check::RustAnalyzer,
                  check::Rustfmt,
+-                check::RustAnalyzer,
                  check::Bootstrap
              ),
-@@ -730,7 +714,6 @@ impl<'a> Builder<'a> {
+             Kind::Test => describe!(
+@@ -706,7 +690,6 @@ impl<'a> Builder<'a> {
                  test::TierCheck,
                  test::Cargotest,
                  test::Cargo,
@@ -135,7 +136,7 @@ index 2fa4455..3f3e5ec 100644
                  test::ErrorIndex,
                  test::Distcheck,
                  test::RunMakeFullDeps,
-@@ -746,7 +729,6 @@ impl<'a> Builder<'a> {
+@@ -722,7 +705,6 @@ impl<'a> Builder<'a> {
                  test::EmbeddedBook,
                  test::EditionGuide,
                  test::Rustfmt,
@@ -143,7 +144,7 @@ index 2fa4455..3f3e5ec 100644
                  test::Clippy,
                  test::RustDemangler,
                  test::CompiletestTest,
-@@ -783,7 +765,6 @@ impl<'a> Builder<'a> {
+@@ -759,7 +741,6 @@ impl<'a> Builder<'a> {
                  doc::CargoBook,
                  doc::Clippy,
                  doc::ClippyBook,
@@ -151,7 +152,7 @@ index 2fa4455..3f3e5ec 100644
                  doc::EmbeddedBook,
                  doc::EditionGuide,
                  doc::StyleGuide,
-@@ -801,12 +782,9 @@ impl<'a> Builder<'a> {
+@@ -777,12 +758,9 @@ impl<'a> Builder<'a> {
                  dist::Analysis,
                  dist::Src,
                  dist::Cargo,
@@ -164,7 +165,7 @@ index 2fa4455..3f3e5ec 100644
                  dist::LlvmTools,
                  dist::RustDev,
                  dist::Bootstrap,
-@@ -823,11 +801,9 @@ impl<'a> Builder<'a> {
+@@ -799,11 +777,9 @@ impl<'a> Builder<'a> {
                  install::Docs,
                  install::Std,
                  install::Cargo,
@@ -176,7 +177,7 @@ index 2fa4455..3f3e5ec 100644
                  install::LlvmTools,
                  install::Src,
                  install::Rustc
-@@ -837,7 +813,6 @@ impl<'a> Builder<'a> {
+@@ -813,7 +789,6 @@ impl<'a> Builder<'a> {
                  run::BuildManifest,
                  run::BumpStage0,
                  run::ReplaceVersionPlaceholder,
@@ -184,7 +185,7 @@ index 2fa4455..3f3e5ec 100644
                  run::CollectLicenseMetadata,
                  run::GenerateCopyright,
                  run::GenerateWindowsSys,
-@@ -1979,10 +1954,7 @@ impl<'a> Builder<'a> {
+@@ -1965,10 +1940,7 @@ impl<'a> Builder<'a> {
              }
          }
  
@@ -197,10 +198,10 @@ index 2fa4455..3f3e5ec 100644
          }
  
 diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 44cd84b..9b37d5d 100644
+index eed7a58..c3bf972 100644
 --- a/src/bootstrap/test.rs
 +++ b/src/bootstrap/test.rs
-@@ -2004,17 +2004,7 @@ impl Step for RustcGuide {
+@@ -2129,17 +2129,7 @@ impl Step for RustcGuide {
      }
  
      fn run(self, builder: &Builder<'_>) {
@@ -209,7 +210,7 @@ index 44cd84b..9b37d5d 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)) {
+-        let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() {
 -            ToolState::TestPass
 -        } else {
 -            ToolState::TestFail
@@ -220,7 +221,7 @@ index 44cd84b..9b37d5d 100644
  }
  
 diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
-index 333f03c..2a0faa2 100644
+index 3050cf7..174e1f0 100644
 --- a/src/tools/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/Cargo.toml
 @@ -1,5 +1,14 @@
@@ -237,5 +238,5 @@ index 333f03c..2a0faa2 100644
 +  "crates/proc-macro-api",
 +]
  exclude = ["crates/proc-macro-test/imp"]
+ resolver = "2"
  
- [workspace.package]
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 9e49580b1..4cdf7fbbb 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 e9395be..2f6819c 100644
+index 3653032..7b82fa5 100644
 --- a/vendor/pkg-config/src/lib.rs
 +++ b/vendor/pkg-config/src/lib.rs
 @@ -117,11 +117,8 @@ pub enum Error {
@@ -49,7 +49,7 @@ index e9395be..2f6819c 100644
          }
      }
  }
-@@ -418,6 +407,8 @@ impl Config {
+@@ -420,6 +409,8 @@ impl Config {
          if host == target {
              return true;
          }
@@ -59,23 +59,23 @@ index e9395be..2f6819c 100644
          // pkg-config may not be aware of cross-compilation, and require
          // a wrapper script that sets up platform-specific prefixes.
 @@ -477,7 +468,11 @@ impl Config {
-     fn command(&self, name: &str, args: &[&str]) -> Command {
-         let exe = self
-             .targetted_env_var("PKG_CONFIG")
--            .unwrap_or_else(|| OsString::from("pkg-config"));
-+            .unwrap_or_else(|| {
+     }
+ 
+     fn run(&self, name: &str, args: &[&str]) -> Result<Vec<u8>, Error> {
+-        let pkg_config_exe = self.targetted_env_var("PKG_CONFIG");
++        let pkg_config_exe = self.targetted_env_var("PKG_CONFIG")
++            .or_else(|| {
 +                self.env_var_os("DEB_HOST_GNU_TYPE")
-+                    .map(|mut t| { t.push(OsString::from("-pkg-config")); t })
-+                    .unwrap_or_else(|| OsString::from("pkg-config"))
++                    .map(|mut t| { t.push(OsString::from("-pkgconf")); t })
 +            });
-         let mut cmd = Command::new(exe);
-         if self.is_static(name) {
-             cmd.arg("--static");
+         let fallback_exe = if pkg_config_exe.is_none() {
+             Some(OsString::from("pkgconf"))
+         } else {
 diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs
-index 4e04ac0..f884e46 100644
+index 0f37c72..f70e8b7 100644
 --- a/vendor/pkg-config/tests/test.rs
 +++ b/vendor/pkg-config/tests/test.rs
-@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
+@@ -31,7 +31,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
      pkg_config::probe_library(name)
  }
  
@@ -83,7 +83,7 @@ index 4e04ac0..f884e46 100644
  fn cross_disabled() {
      let _g = LOCK.lock();
      reset();
-@@ -46,7 +45,6 @@ fn cross_disabled() {
+@@ -43,7 +42,6 @@ fn cross_disabled() {
      }
  }
  
diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
index 568bf230f..c6acfd458 100644
--- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
+++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
@@ -6,12 +6,12 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase
 ---
  src/tools/linkchecker/main.rs                      |  28 +++++-
  vendor/mdbook/src/book/init.rs                     |  19 ----
- .../src/renderer/html_handlebars/hbs_renderer.rs   | 110 ++++-----------------
+ .../src/renderer/html_handlebars/hbs_renderer.rs   | 104 ++++-----------------
  .../mdbook/src/renderer/html_handlebars/search.rs  |   2 -
- vendor/mdbook/src/theme/index.hbs                  |  99 +------------------
- vendor/mdbook/src/theme/mod.rs                     |  27 -----
+ vendor/mdbook/src/theme/index.hbs                  |  99 +-------------------
+ vendor/mdbook/src/theme/mod.rs                     |  27 ------
  vendor/mdbook/src/theme/searcher/mod.rs            |   2 -
- 7 files changed, 47 insertions(+), 240 deletions(-)
+ 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
@@ -67,7 +67,7 @@ index c8a3700..4095c03 100644
                          report.links_ignored_exception += 1;
                      } else {
 diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs
-index ebcdd93..41dab42 100644
+index faca1d0..c1a82a3 100644
 --- a/vendor/mdbook/src/book/init.rs
 +++ b/vendor/mdbook/src/book/init.rs
 @@ -153,25 +153,6 @@ impl BookBuilder {
@@ -97,10 +97,10 @@ index ebcdd93..41dab42 100644
      }
  
 diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-index e170e2f..caa2eff 100644
+index 709aa06..17ff63c 100644
 --- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
 +++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition};
+@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEditio
  use crate::errors::*;
  use crate::renderer::html_handlebars::helpers;
  use crate::renderer::{RenderContext, Renderer};
@@ -116,7 +116,7 @@ index e170e2f..caa2eff 100644
  use std::path::{Path, PathBuf};
  
  use crate::utils::fs::get_404_output_file;
-@@ -235,105 +236,28 @@ impl HtmlHandlebars {
+@@ -250,99 +251,28 @@ impl HtmlHandlebars {
          if let Some(contents) = &theme.favicon_svg {
              write_file(destination, "favicon.svg", contents)?;
          }
@@ -175,7 +175,8 @@ index e170e2f..caa2eff 100644
 +            "/usr/share/javascript/mathjax/MathJax.js",
 +            destination.join("MathJax.js"),
          )?;
--        if html_config.copy_fonts {
+-        // Don't copy the stock fonts if the user has specified their own fonts to use.
+-        if html_config.copy_fonts && theme.fonts_css.is_none() {
 -            write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?;
 -            for (file_name, contents) in theme::fonts::LICENSES.iter() {
 -                write_file(destination, file_name, contents)?;
@@ -191,20 +192,13 @@ index e170e2f..caa2eff 100644
 -        }
 -        if let Some(fonts_css) = &theme.fonts_css {
 -            if !fonts_css.is_empty() {
--                if html_config.copy_fonts {
--                    warn!(
--                        "output.html.copy_fonts is deprecated.\n\
--                        Set copy_fonts=false and ensure the fonts you want are in \
--                        the `theme/fonts/` directory."
--                    );
--                }
--                write_file(destination, "fonts/fonts.css", &fonts_css)?;
+-                write_file(destination, "fonts/fonts.css", fonts_css)?;
 -            }
 -        }
 -        if !html_config.copy_fonts && theme.fonts_css.is_none() {
 -            warn!(
--                "output.html.copy_fonts is deprecated.\n\
--                This book appears to have copy_fonts=false without a fonts.css file.\n\
+-                "output.html.copy-fonts is deprecated.\n\
+-                This book appears to have copy-fonts=false in book.toml without a fonts.css file.\n\
 -                Add an empty `theme/fonts/fonts.css` file to squelch this warning."
 -            );
 -        }
@@ -238,7 +232,7 @@ index e170e2f..caa2eff 100644
          Ok(())
      }
 diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs
-index a9e2f5c..3e3f69c 100644
+index 24d62fd..849a48c 100644
 --- a/vendor/mdbook/src/renderer/html_handlebars/search.rs
 +++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs
 @@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
@@ -251,7 +245,7 @@ index a9e2f5c..3e3f69c 100644
      }
  
 diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs
-index 6f3948c..7e5c54c 100644
+index 80315c4..48413b0 100644
 --- a/vendor/mdbook/src/theme/index.hbs
 +++ b/vendor/mdbook/src/theme/index.hbs
 @@ -33,10 +33,7 @@
@@ -324,7 +318,7 @@ index 6f3948c..7e5c54c 100644
          <nav id="sidebar" class="sidebar" aria-label="Table of contents">
              <div class="sidebar-scrollbox">
                  {{#toc}}{{/toc}}
-@@ -240,54 +195,8 @@
+@@ -262,54 +217,8 @@
          </script>
          {{/if}}
  
diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch
index 17254fb53..09b8db752 100644
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/d-0005-no-jemalloc.patch
@@ -26,7 +26,7 @@ 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 6273ea5..642fb05 100644
+index 602e742..5faecc5 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"
@@ -36,7 +36,7 @@ index 6273ea5..642fb05 100644
 -jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
  
  [target.'cfg(target_os = "linux")'.dependencies]
- perf-event = "0.4.7"
+ perf-event = "=0.4.7"
 @@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
  
  [features]
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 7c31b69d9..21e1e0b06 100644
--- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
+++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
@@ -4,14 +4,14 @@ Subject: d-0010-cargo-remove-vendored-c-crates
 
 Last-Update: 2023-05-17
 ---
- src/tools/cargo/Cargo.toml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ src/tools/cargo/Cargo.toml | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
-index 05c95c7..a7475f6 100644
+index 7e383be..384fe45 100644
 --- a/src/tools/cargo/Cargo.toml
 +++ b/src/tools/cargo/Cargo.toml
-@@ -206,8 +206,6 @@ test = false
+@@ -203,8 +203,6 @@ test = false
  doc = false
  
  [features]
diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch
index 00e59567c..b9a1f1b69 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 <YYYY-MM-DD, last update of the meta-information, option
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml
-index 945ee8e..04b9800 100644
+index d89f441..6d89163 100644
 --- a/vendor/curl-sys/Cargo.toml
 +++ b/vendor/curl-sys/Cargo.toml
 @@ -52,7 +52,7 @@ version = "0.3.3"
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 f643a446f..e30e2a40d 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 d56054a..4c2aa4b 100644
+index 9b99d5a..980f94a 100644
 --- a/src/tools/cargo/src/cargo/core/features.rs
 +++ b/src/tools/cargo/src/cargo/core/features.rs
-@@ -1183,9 +1183,8 @@ pub fn channel() -> String {
+@@ -1215,9 +1215,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 624f3bcfd..0a6bd3235 100644
--- a/debian/patches/d-0020-remove-windows-dependencies.patch
+++ b/debian/patches/d-0020-remove-windows-dependencies.patch
@@ -9,31 +9,32 @@ Subject: d-0020-remove-windows-dependencies
  compiler/rustc_driver_impl/Cargo.toml              |  6 ----
  compiler/rustc_errors/Cargo.toml                   |  8 -----
  compiler/rustc_session/Cargo.toml                  |  7 ----
- library/backtrace/Cargo.toml                       |  3 --
+ library/backtrace/Cargo.toml                       | 13 -------
  src/bootstrap/Cargo.toml                           | 15 --------
- src/tools/cargo/Cargo.toml                         | 17 ---------
+ src/tools/cargo/Cargo.toml                         | 18 ++--------
  .../cargo/crates/cargo-test-support/Cargo.toml     | 41 ++++++++++------------
  src/tools/cargo/crates/cargo-util/Cargo.toml       |  7 ----
  src/tools/cargo/crates/home/Cargo.toml             |  3 --
  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 ---
- 14 files changed, 19 insertions(+), 122 deletions(-)
+ 15 files changed, 22 insertions(+), 133 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
-index 0ac12d3..3f483ab 100644
+index 984efa2..f4c194b 100644
 --- a/compiler/rustc_codegen_ssa/Cargo.toml
 +++ b/compiler/rustc_codegen_ssa/Cargo.toml
 @@ -49,7 +49,3 @@ libc = "0.2.50"
  version = "0.31.1"
  default-features = false
- features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"]
+ features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"]
 -
 -[target.'cfg(windows)'.dependencies.windows]
 -version = "0.48.0"
 -features = ["Win32_Globalization"]
 diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
-index 78f73d1..fce2ee0 100644
+index a5c3cb3..5cf1462 100644
 --- a/compiler/rustc_data_structures/Cargo.toml
 +++ b/compiler/rustc_data_structures/Cargo.toml
 @@ -37,16 +37,6 @@ itertools = "0.10.1"
@@ -71,7 +72,7 @@ index 67352c5..f27cb40 100644
  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 bd3033f..83c8036 100644
+index e8bcd7c..36a5ee6 100644
 --- a/compiler/rustc_errors/Cargo.toml
 +++ b/compiler/rustc_errors/Cargo.toml
 @@ -26,13 +26,5 @@ termize = "0.1.1"
@@ -89,10 +90,10 @@ index bd3033f..83c8036 100644
  [features]
  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 3af83aa..c3d2a00 100644
+index 1291d14..d9f8675 100644
 --- a/compiler/rustc_session/Cargo.toml
 +++ b/compiler/rustc_session/Cargo.toml
-@@ -23,10 +23,3 @@ termize = "0.1.1"
+@@ -25,10 +25,3 @@ termize = "0.1.1"
  
  [target.'cfg(unix)'.dependencies]
  libc = "0.2"
@@ -104,10 +105,10 @@ index 3af83aa..c3d2a00 100644
 -    "Win32_System_LibraryLoader",
 -]
 diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml
-index 4779091..aa78771 100644
+index cff2c9e..ad053f0 100644
 --- a/library/backtrace/Cargo.toml
 +++ b/library/backtrace/Cargo.toml
-@@ -45,9 +45,6 @@ version = "0.30.0"
+@@ -45,9 +45,6 @@ version = "0.31.1"
  default-features = false
  features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
  
@@ -135,10 +136,10 @@ index 4779091..aa78771 100644
  
  [[example]]
 diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
-index 367c619..72c9992 100644
+index 85eb543..cf21349 100644
 --- a/src/bootstrap/Cargo.toml
 +++ b/src/bootstrap/Cargo.toml
-@@ -63,21 +63,6 @@ semver = "1.0.17"
+@@ -62,21 +62,6 @@ semver = "1.0.17"
  [target.'cfg(not(target_os = "solaris"))'.dependencies]
  fd-lock = "3.0.8"
  
@@ -161,7 +162,7 @@ index 367c619..72c9992 100644
  pretty_assertions = "1.2"
  
 diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
-index a7475f6..4ad22f5 100644
+index 384fe45..7ed3853 100644
 --- a/src/tools/cargo/Cargo.toml
 +++ b/src/tools/cargo/Cargo.toml
 @@ -2,7 +2,9 @@
@@ -183,7 +184,7 @@ index a7475f6..4ad22f5 100644
  
  [package]
  name = "cargo"
-@@ -174,22 +175,6 @@ walkdir.workspace = true
+@@ -174,19 +175,6 @@ walkdir.workspace = true
  [target.'cfg(not(windows))'.dependencies]
  openssl = { workspace = true, optional = true }
  
@@ -196,11 +197,8 @@ index a7475f6..4ad22f5 100644
 -  "Win32_Foundation",
 -  "Win32_Storage_FileSystem",
 -  "Win32_System_Console",
--  "Win32_System_IO",
 -  "Win32_System_Threading",
 -  "Win32_System_JobObjects",
--  "Win32_Security",
--  "Win32_System_SystemServices"
 -]
 -
  [dev-dependencies]
@@ -256,7 +254,7 @@ index 305c809a..c656678 100644
 +toml = "0.7.0"
 +url = "2.2.2"
 diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml
-index f01705f..138690f 100644
+index 6145810..46af186 100644
 --- a/src/tools/cargo/crates/cargo-util/Cargo.toml
 +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
 @@ -19,10 +19,3 @@ same-file.workspace = true
@@ -299,11 +297,25 @@ index d2f2583..61f7be4 100644
 -    "Win32_Foundation",
 -    "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 5faecc5..0d39d3b 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"] }
+ [target.'cfg(target_os = "linux")'.dependencies]
+ perf-event = "=0.4.7"
+ 
+-[target.'cfg(windows)'.dependencies]
+-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
+-
+ [features]
+ cpu_profiler = []
+ 
 diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-index f0f1900..3137edb 100644
+index 5b72d57..df53f34 100644
 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-@@ -67,12 +67,6 @@ tt.workspace = true
+@@ -77,12 +77,6 @@ tt.workspace = true
  vfs-notify.workspace = true
  vfs.workspace = true
  
@@ -315,27 +327,13 @@ index f0f1900..3137edb 100644
 -
  [dev-dependencies]
  expect-test = "1.4.0"
- jod-thread = "0.1.2"
-diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
-index 642fb05..0883bb7 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"] }
- [target.'cfg(target_os = "linux")'.dependencies]
- perf-event = "0.4.7"
- 
--[target.'cfg(windows)'.dependencies]
--winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
--
- [features]
- cpu_profiler = []
- 
+ xshell = "0.2.2"
 diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-index c881f2f..5cb4cb0 100644
+index a67f36a..bfbd00f 100644
 --- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-@@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", optional = true }
- always-assert = { version = "0.1.2", features = ["log"] }
+@@ -19,10 +19,6 @@ jod-thread = "0.1.2"
+ crossbeam-channel = "0.5.5"
  # Think twice before adding anything here
  
 -[target.'cfg(windows)'.dependencies]
diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
index 8796a5c92..146c95eff 100644
--- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
+++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
@@ -1,85 +1,101 @@
-From 1a6f5062adaad5d7f1a4f1cf792f4ee8c3c17e9f Mon Sep 17 00:00:00 2001
-From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
+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
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
 
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- vendor/anstream/Cargo.toml               |  6 +----
+ 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                 | 11 ---------
+ vendor/chrono/Cargo.toml                 | 12 ----------
  vendor/colored/Cargo.toml                |  4 ----
- vendor/compiletest_rs/Cargo.toml         |  6 -----
- vendor/concolor-query/Cargo.toml         |  7 ------
- vendor/ctrlc/Cargo.toml                  | 18 ---------------
  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-0.3.0/Cargo.toml            |  7 ------
  vendor/errno/Cargo.toml                  |  6 -----
  vendor/fd-lock/Cargo.toml                |  8 -------
- vendor/filetime-0.2.20/Cargo.toml        |  7 ------
  vendor/filetime/Cargo.toml               |  7 ------
- vendor/gix-discover/Cargo.toml           |  3 ---
- vendor/gix-sec/Cargo.toml                | 13 -----------
- vendor/home-0.5.4/Cargo.toml             |  8 -------
+ vendor/gix-sec/Cargo.toml                | 12 ----------
  vendor/home/Cargo.toml                   |  7 ------
  vendor/iana-time-zone/Cargo.toml         |  4 ----
- vendor/ignore-0.4.18/Cargo.toml          |  2 --
  vendor/ignore/Cargo.toml                 |  3 ---
  vendor/io-close/Cargo.toml               |  3 ---
- vendor/io-lifetimes-1.0.9/Cargo.toml     | 13 -----------
  vendor/io-lifetimes/Cargo.toml           | 13 -----------
- vendor/is-terminal-0.4.6/Cargo.toml      | 11 ---------
+ 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            |  4 ----
+ vendor/libssh2-sys/Cargo.toml            |  5 -----
  vendor/nu-ansi-term/Cargo.toml           | 10 ---------
- vendor/opener-0.5.0/Cargo.toml           |  3 ---
  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-0.9.6/Cargo.toml |  9 --------
- vendor/parking_lot_core/Cargo.toml       |  9 --------
+ vendor/parking_lot_core/Cargo.toml       |  3 ---
  vendor/pretty_assertions/Cargo.toml      |  6 -----
- vendor/remove_dir_all/Cargo.toml         |  3 ---
- vendor/rustix-0.37.6/Cargo.toml          | 12 ----------
- vendor/rustix-0.37.7/Cargo.toml          | 12 ----------
+ 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                | 11 ---------
- vendor/socket2-0.4.1/Cargo.toml          |  3 ---
+ vendor/snapbox/Cargo.toml                |  6 -----
  vendor/socket2/Cargo.toml                |  8 -------
  vendor/stacker/Cargo.toml                | 10 ---------
  vendor/sysinfo/Cargo.toml                | 38 --------------------------------
- vendor/tempfile-3.3.0/Cargo.toml         |  3 ---
  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                  |  6 -----
+ vendor/tokio/Cargo.toml                  | 21 ------------------
  vendor/uuid/Cargo.toml                   |  4 ----
- vendor/walkdir-2.3.2/Cargo.toml          |  6 -----
  vendor/walkdir/Cargo.toml                |  3 ---
- 59 files changed, 1 insertion(+), 462 deletions(-)
+ vendor/yansi-term/Cargo.toml             |  3 ---
+ 48 files changed, 1 insertion(+), 397 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"
+ 
+ [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 eb04906..7e2ed64 100644
+index 75d78e2..a0eddb4 100644
 --- a/vendor/anstream/Cargo.toml
 +++ b/vendor/anstream/Cargo.toml
-@@ -137,8 +137,4 @@ default = [
+@@ -136,10 +136,4 @@ auto = [
+ ]
+ default = [
      "auto",
-     "wincon",
+-    "wincon",
  ]
 -wincon = ["dep:anstyle-wincon"]
 -
 -[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "0.2.0"
+-version = "1.0.1"
 -optional = true
-+wincon = []
+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"""
+ exactly = 1
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
+-features = [
+-    "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
@@ -94,7 +110,7 @@ index d6bf2d0..7cebc31 100644
  [badges.travis-ci]
  repository = "softprops/atty"
 diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml
-index 96f4146..4a48f6e 100644
+index f33884a..b43a0dd 100644
 --- a/vendor/backtrace/Cargo.toml
 +++ b/vendor/backtrace/Cargo.toml
 @@ -127,18 +127,5 @@ serialize-serde = ["serde"]
@@ -117,10 +133,10 @@ index 96f4146..4a48f6e 100644
 -version = "0.3.9"
 -optional = true
 diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml
-index eaf0e69..79ab5f9 100644
+index 7f49bad..6229f0a 100644
 --- a/vendor/chrono/Cargo.toml
 +++ b/vendor/chrono/Cargo.toml
-@@ -114,7 +114,6 @@ __internal_bench = ["criterion"]
+@@ -107,7 +107,6 @@ __internal_bench = ["criterion"]
  alloc = []
  clock = [
      "std",
@@ -128,7 +144,7 @@ index eaf0e69..79ab5f9 100644
      "iana-time-zone",
  ]
  default = [
-@@ -150,13 +149,3 @@ version = "0.3"
+@@ -146,14 +145,3 @@ version = "0.1.1"
  version = "0.1.45"
  features = ["fallback"]
  optional = true
@@ -140,6 +156,7 @@ index eaf0e69..79ab5f9 100644
 -    "minwinbase",
 -    "minwindef",
 -    "timezoneapi",
+-    "sysinfoapi",
 -]
 -optional = true
 diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml
@@ -154,37 +171,8 @@ index 3a6b59b..065eecb 100644
 -version = "0.3"
 -features = ["consoleapi", "processenv", "winbase"]
 -default-features = false
-diff --git a/vendor/compiletest_rs/Cargo.toml b/vendor/compiletest_rs/Cargo.toml
-index c1b3ecd..cae8c30 100644
---- a/vendor/compiletest_rs/Cargo.toml
-+++ b/vendor/compiletest_rs/Cargo.toml
-@@ -75,9 +75,3 @@ tmp = ["tempfile"]
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
- 
--[target."cfg(windows)".dependencies.miow]
--version = "0.3"
--
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["winerror"]
-diff --git a/vendor/concolor-query/Cargo.toml b/vendor/concolor-query/Cargo.toml
-index a25ce89..c578c4c 100644
---- a/vendor/concolor-query/Cargo.toml
-+++ b/vendor/concolor-query/Cargo.toml
-@@ -33,10 +33,3 @@ keywords = [
- categories = ["command-line-interface"]
- license = "MIT OR Apache-2.0"
- repository = "https://github.com/rust-cli/concolor"
--
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
--features = [
--    "Win32_System_Console",
--    "Win32_Foundation",
--]
 diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml
-index 04b9800..4a4968d 100644
+index 6d89163..0b17324 100644
 --- a/vendor/curl-sys/Cargo.toml
 +++ b/vendor/curl-sys/Cargo.toml
 @@ -73,16 +73,6 @@ zlib-ng-compat = [
@@ -239,10 +227,10 @@ index e9d8d0c..acb2eb7 100644
  [badges.maintenance]
  status = "as-is"
 diff --git a/vendor/dirs-sys/Cargo.toml b/vendor/dirs-sys/Cargo.toml
-index 6c41007..4d79134 100644
+index 9951d24..0a86f4d 100644
 --- a/vendor/dirs-sys/Cargo.toml
 +++ b/vendor/dirs-sys/Cargo.toml
-@@ -23,6 +23,3 @@ version = "0.4"
+@@ -22,6 +22,3 @@ version = "0.4"
  default-features = false
  [target."cfg(unix)".dependencies.libc]
  version = "0.2"
@@ -295,16 +283,15 @@ index 8547ec3..4ecd973 100644
 -    "Win32_Storage_FileSystem",
 -]
 diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml
-index 44a3e884..041a6bb 100644
+index 254f82f..65248eb 100644
 --- a/vendor/gix-sec/Cargo.toml
 +++ b/vendor/gix-sec/Cargo.toml
-@@ -61,16 +61,3 @@ serde = [
- 
+@@ -63,15 +63,3 @@ serde = [
  [target."cfg(not(windows))".dependencies.libc]
  version = "0.2.123"
--
+ 
 -[target."cfg(windows)".dependencies.gix-path]
--version = "^0.8.0"
+-version = "^0.8.1"
 -
 -[target."cfg(windows)".dependencies.windows]
 -version = "0.48"
@@ -331,7 +318,7 @@ index cd608b1..eecfb89 100644
 -    "Win32_UI_Shell",
 -]
 diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml
-index 5cdc175..271a062 100644
+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"
@@ -365,7 +352,7 @@ index 5e36444..82f9ce5 100644
 -version = "0.3.9"
 -features = ["handleapi", "std", "winsock2"]
 diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml
-index b9ed913..0fd300a 100644
+index ef92ff0..c2733fb 100644
 --- a/vendor/io-lifetimes/Cargo.toml
 +++ b/vendor/io-lifetimes/Cargo.toml
 @@ -43,7 +43,6 @@ optional = true
@@ -393,10 +380,10 @@ index b9ed913..0fd300a 100644
 -]
 -optional = true
 diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml
-index 7957a9c..0ab2ae1 100644
+index e0baea0..7790abd 100644
 --- a/vendor/is-terminal/Cargo.toml
 +++ b/vendor/is-terminal/Cargo.toml
-@@ -53,14 +53,3 @@ features = ["termios"]
+@@ -54,14 +54,3 @@ features = ["stdio"]
  
  [target."cfg(target_os = \"hermit\")".dependencies.hermit-abi]
  version = "0.3.0"
@@ -427,7 +414,7 @@ index 65168d5..7785a7e 100644
 -    "libloaderapi",
 -]
 diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml
-index 45f4a71..b0d3e26 100644
+index 45f4a71..f791ce9 100644
 --- a/vendor/libssh2-sys/Cargo.toml
 +++ b/vendor/libssh2-sys/Cargo.toml
 @@ -43,7 +43,6 @@ version = "1.0.25"
@@ -523,22 +510,16 @@ index 6981516..9fb8bd2 100644
 -    "handleapi",
 -]
 diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml
-index 361186b..e00c191 100644
+index d76740d..7da23fc 100644
 --- a/vendor/parking_lot_core/Cargo.toml
 +++ b/vendor/parking_lot_core/Cargo.toml
-@@ -57,12 +57,3 @@ version = "0.2.8"
+@@ -57,6 +57,3 @@ version = "0.3"
  
  [target."cfg(unix)".dependencies.libc]
  version = "0.2.95"
 -
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
--features = [
--    "Win32_Foundation",
--    "Win32_System_LibraryLoader",
--    "Win32_System_SystemServices",
--    "Win32_System_WindowsProgramming",
--]
+-[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
@@ -553,22 +534,54 @@ index f8370f7..4531652 100644
 -
 -[target."cfg(windows)".dependencies.output_vt100]
 -version = "0.1.2"
-diff --git a/vendor/remove_dir_all/Cargo.toml b/vendor/remove_dir_all/Cargo.toml
-index a847288..aaf637f 100644
---- a/vendor/remove_dir_all/Cargo.toml
-+++ b/vendor/remove_dir_all/Cargo.toml
-@@ -23,6 +23,3 @@ license = "MIT/Apache-2.0"
- repository = "https://github.com/XAMPPRocky/remove_dir_all.git"
- [dev-dependencies.doc-comment]
- version = "0.3"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"]
+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
+ 
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
+-features = [
+-    "Win32_Foundation",
+-    "Win32_Networking_WinSock",
+-    "Win32_NetworkManagement_IpHelper",
+-    "Win32_System_Threading",
+-]
+-
+-[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"
+ version = "1.5.2"
+ optional = true
+ 
+-[target."cfg(windows)".dependencies.libc_errno]
+-version = "0.3.1"
+-default-features = false
+-package = "errno"
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
+-features = [
+-    "Win32_Foundation",
+-    "Win32_Networking_WinSock",
+-    "Win32_NetworkManagement_IpHelper",
+-    "Win32_System_Threading",
+-]
+-
+-[target."cfg(windows)".dev-dependencies.ctor]
+-version = "0.2.0"
 diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml
-index c928526..6b7cff3 100644
+index dd40b25..95b35ba 100644
 --- a/vendor/rustix/Cargo.toml
 +++ b/vendor/rustix/Cargo.toml
-@@ -233,20 +233,3 @@ package = "errno"
+@@ -235,20 +235,3 @@ package = "errno"
  [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell]
  version = "1.5.2"
  optional = true
@@ -600,10 +613,10 @@ index 4f66820..11ef472 100644
 -[target."cfg(windows)".dependencies.winapi-util]
 -version = "0.1.1"
 diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml
-index a9a74e1..8b0bf63 100644
+index 5ca8579..8f438dd 100644
 --- a/vendor/snapbox/Cargo.toml
 +++ b/vendor/snapbox/Cargo.toml
-@@ -161,7 +157,6 @@ cmd = [
+@@ -161,7 +161,6 @@ cmd = [
      "dep:os_pipe",
      "dep:wait-timeout",
      "dep:libc",
@@ -611,7 +624,7 @@ index a9a74e1..8b0bf63 100644
  ]
  color = [
      "dep:anstream",
-@@ -196,8 +190,3 @@ structured-data = ["dep:serde_json"]
+@@ -199,8 +198,3 @@ structured-data = ["dep:serde_json"]
  [target."cfg(unix)".dependencies.libc]
  version = "0.2.137"
  optional = true
@@ -701,16 +714,16 @@ index f8719a4..deb2e40 100644
 -    "std",
 -]
 diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml
-index 85006d8..013e986 100644
+index 1af1206..f665e00 100644
 --- a/vendor/tempfile/Cargo.toml
 +++ b/vendor/tempfile/Cargo.toml
-@@ -50,10 +50,3 @@ features = ["fs"]
+@@ -53,10 +53,3 @@ features = ["fs"]
  
  [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
  version = "0.3"
 -
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45"
+-version = "0.48"
 -features = [
 -    "Win32_Storage_FileSystem",
 -    "Win32_Foundation",
@@ -772,41 +785,62 @@ index d248f4d..9bd9f37 100644
  [badges.cirrus-ci]
  repository = "JohnTitor/termize"
 diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml
-index 11ec0c0..bf2ad39 100644
+index da1e4d1..55afa86 100644
 --- a/vendor/tokio/Cargo.toml
 +++ b/vendor/tokio/Cargo.toml
-@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "r
- io-std = []
- io-util = ["memchr", "bytes"]
- macros = ["tokio-macros"]
--net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds", "winapi/namedpipeapi"]
--process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry", "winapi/threadpoollegacyapiset"]
-+net = ["libc", "mio/os-poll", "mio/os-util", "mio/tcp", "mio/udp", "mio/uds"]
-+process = ["bytes", "once_cell", "libc", "mio/os-poll", "mio/os-util", "mio/uds", "signal-hook-registry"]
+@@ -122,11 +122,6 @@ net = [
+     "mio/os-ext",
+     "mio/net",
+     "socket2",
+-    "windows-sys/Win32_Foundation",
+-    "windows-sys/Win32_Security",
+-    "windows-sys/Win32_Storage_FileSystem",
+-    "windows-sys/Win32_System_Pipes",
+-    "windows-sys/Win32_System_SystemServices",
+ ]
+ process = [
+     "bytes",
+@@ -135,9 +130,6 @@ process = [
+     "mio/os-ext",
+     "mio/net",
+     "signal-hook-registry",
+-    "windows-sys/Win32_Foundation",
+-    "windows-sys/Win32_System_Threading",
+-    "windows-sys/Win32_System_WindowsProgramming",
+ ]
  rt = []
- rt-multi-thread = ["num_cpus", "rt"]
--signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry", "winapi/consoleapi"]
-+signal = ["once_cell", "libc", "mio/os-poll", "mio/uds", "mio/os-util", "signal-hook-registry"]
+ rt-multi-thread = [
+@@ -150,8 +142,6 @@ signal = [
+     "mio/net",
+     "mio/os-ext",
+     "signal-hook-registry",
+-    "windows-sys/Win32_Foundation",
+-    "windows-sys/Win32_System_Console",
+ ]
+ stats = []
  sync = []
- test-util = []
- time = []
-@@ -123,9 +123,3 @@ version = "0.2.42"
- 
- [target."cfg(unix)".dev-dependencies.nix]
- version = "0.22.0"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.8"
+@@ -217,14 +207,3 @@ features = [
+     "socket",
+ ]
+ default-features = false
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48"
 -optional = true
--default-features = false
--[target."cfg(windows)".dev-dependencies.ntapi]
--version = "0.3.6"
+-
+-[target."cfg(windows)".dev-dependencies.windows-sys]
+-version = "0.48"
+-features = [
+-    "Win32_Foundation",
+-    "Win32_Security_Authorization",
+-]
 diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml
-index b783688..4e98553 100644
+index b806036..4094678 100644
 --- a/vendor/uuid/Cargo.toml
 +++ b/vendor/uuid/Cargo.toml
-@@ -180,10 +180,6 @@ package = "wasm-bindgen"
- [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
- version = "0.3"
+@@ -185,10 +185,6 @@ version = "0.3"
+ version = "0.2"
+ package = "wasm-bindgen"
  
 -[target."cfg(windows)".dev-dependencies.windows-sys]
 -version = "0.48.0"
diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch
index 2d542a1e9..b02bcfafc 100644
--- a/debian/patches/d-armel-fix-lldb.patch
+++ b/debian/patches/d-armel-fix-lldb.patch
@@ -4,7 +4,7 @@ Index: rust/src/bootstrap/test.rs
 ===================================================================
 --- rust.orig/src/bootstrap/test.rs
 +++ rust/src/bootstrap/test.rs
-@@ -1516,7 +1516,11 @@ note: if you're sure you want to do this
+@@ -1631,7 +1631,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
index b7e3c457b..eab9c456b 100644
--- a/debian/patches/d-bootstrap-cargo-check-cfg.patch
+++ b/debian/patches/d-bootstrap-cargo-check-cfg.patch
@@ -5,7 +5,7 @@ Index: rust/src/bootstrap/builder.rs
 ===================================================================
 --- rust.orig/src/bootstrap/builder.rs
 +++ rust/src/bootstrap/builder.rs
-@@ -1382,9 +1382,9 @@ impl<'a> Builder<'a> {
+@@ -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 {
diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch
index 248dc118c..dadecf9d0 100644
--- a/debian/patches/d-bootstrap-cargo-doc-paths.patch
+++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch
@@ -106,7 +106,7 @@ Index: rust/src/doc/reference/src/conditional-compilation.md
 ===================================================================
 --- rust.orig/src/doc/reference/src/conditional-compilation.md
 +++ rust/src/doc/reference/src/conditional-compilation.md
-@@ -370,6 +370,6 @@ println!("I'm running on a {} machine!",
+@@ -376,6 +376,6 @@ println!("I'm running on a {} machine!",
  [`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute
  [attribute]: attributes.md
  [attributes]: attributes.md
@@ -302,7 +302,7 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md
 ===================================================================
 --- rust.orig/src/doc/unstable-book/src/compiler-flags/sanitizer.md
 +++ rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md
-@@ -793,7 +793,7 @@ It is strongly recommended to combine sa
+@@ -804,7 +804,7 @@ It is strongly recommended to combine sa
  instrumented standard library, for example using [cargo `-Zbuild-std`
  functionality][build-std].
  
@@ -353,7 +353,7 @@ Index: rust/src/doc/rustc/src/platform-support/fuchsia.md
 ===================================================================
 --- rust.orig/src/doc/rustc/src/platform-support/fuchsia.md
 +++ rust/src/doc/rustc/src/platform-support/fuchsia.md
-@@ -932,7 +932,7 @@ attach and load any relevant debug symbo
+@@ -929,7 +929,7 @@ attach and load any relevant debug symbo
  [Fuchsia]: https://fuchsia.dev/
  [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build
  [rustup]: https://rustup.rs/
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
index e4a833155..e989666a1 100644
--- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch
+++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
@@ -12,7 +12,7 @@ Index: rust/src/bootstrap/lib.rs
 ===================================================================
 --- rust.orig/src/bootstrap/lib.rs
 +++ rust/src/bootstrap/lib.rs
-@@ -1091,10 +1091,9 @@ impl Build {
+@@ -1110,10 +1110,9 @@ impl Build {
  
          match which {
              GitRepo::Rustc => {
diff --git a/debian/patches/d-bootstrap-install-symlinks.patch b/debian/patches/d-bootstrap-install-symlinks.patch
index 00f84e0c7..5e4e125d9 100644
--- a/debian/patches/d-bootstrap-install-symlinks.patch
+++ b/debian/patches/d-bootstrap-install-symlinks.patch
@@ -13,24 +13,24 @@ Index: rust/src/tools/rust-installer/install-template.sh
 ===================================================================
 --- rust.orig/src/tools/rust-installer/install-template.sh
 +++ rust/src/tools/rust-installer/install-template.sh
-@@ -616,7 +616,10 @@ install_components() {
+@@ -617,7 +617,10 @@ install_components() {
  
- 		    maybe_backup_path "$_file_install_path"
+             maybe_backup_path "$_file_install_path"
  
--		    if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
-+		    if [ -h "$_src_dir/$_component/$_file" ]
-+		    then
-+			run cp -d "$_src_dir/$_component/$_file" "$_file_install_path"
-+		    elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
- 		    then
- 			run cp "$_src_dir/$_component/$_file" "$_file_install_path"
- 			run chmod 755 "$_file_install_path"
-@@ -638,7 +641,7 @@ install_components() {
+-            if echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
++            if [ -h "$_src_dir/$_component/$_file" ]
++            then
++            run cp -d "$_src_dir/$_component/$_file" "$_file_install_path"
++            elif echo "$_file" | grep "^bin/" > /dev/null || test -x "$_src_dir/$_component/$_file"
+             then
+             run cp "$_src_dir/$_component/$_file" "$_file_install_path"
+             run chmod 755 "$_file_install_path"
+@@ -639,7 +642,7 @@ install_components() {
  
- 		    maybe_backup_path "$_file_install_path"
+             maybe_backup_path "$_file_install_path"
  
--		    run cp -R "$_src_dir/$_component/$_file" "$_file_install_path"
-+		    run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path"
- 		    critical_need_ok "failed to copy directory"
+-            run cp -R "$_src_dir/$_component/$_file" "$_file_install_path"
++            run cp -dR "$_src_dir/$_component/$_file" "$_file_install_path"
+             critical_need_ok "failed to copy directory"
  
                      # Set permissions. 0755 for dirs, 644 for files
diff --git a/debian/patches/d-bootstrap-no-assume-tools.patch b/debian/patches/d-bootstrap-no-assume-tools.patch
index c9d066619..0d9ff8973 100644
--- a/debian/patches/d-bootstrap-no-assume-tools.patch
+++ b/debian/patches/d-bootstrap-no-assume-tools.patch
@@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder/tests.rs
 ===================================================================
 --- rust.orig/src/bootstrap/builder/tests.rs
 +++ rust/src/bootstrap/builder/tests.rs
-@@ -380,9 +380,13 @@ mod dist {
+@@ -387,9 +387,13 @@ mod dist {
      #[test]
      fn dist_only_cross_host() {
          let b = TargetSelection::from_user("B");
diff --git a/debian/patches/d-bootstrap-old-cargo-compat.patch b/debian/patches/d-bootstrap-old-cargo-compat.patch
deleted file mode 100644
index 0dacb4521..000000000
--- a/debian/patches/d-bootstrap-old-cargo-compat.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:39 +0200
-Subject: Backwards-compat for cargo 0.47
-
-  The flag being removed here was added in
-  https://github.com/rust-lang/cargo/pull/9404 released in cargo 0.54
-  
-  This works around a feature introduced in this PR
-  https://github.com/rust-lang/cargo/pull/8640 released in cargo 0.53
-  
-  Therefore it is not needed for Debian's current cargo 0.47.
-  
-  We can drop this patch when updating to cargo 0.54 and later.
----
- src/bootstrap/doc.rs | 3 ---
- 1 file changed, 3 deletions(-)
-
-Index: rust/src/bootstrap/doc.rs
-===================================================================
---- rust.orig/src/bootstrap/doc.rs
-+++ rust/src/bootstrap/doc.rs
-@@ -613,7 +613,6 @@ fn doc_std(
-             .arg(&*target_dir.to_string_lossy())
-             .arg("-p")
-             .arg(package)
--            .arg("-Zskip-rustdoc-fingerprint")
-             .arg("--")
-             .arg("-Z")
-             .arg("unstable-options")
-@@ -713,7 +712,6 @@ impl Step for Rustc {
-         cargo.rustdocflag("--generate-link-to-definition");
-         compile::rustc_cargo(builder, &mut cargo, target, compiler.stage);
-         cargo.arg("-Zunstable-options");
--        cargo.arg("-Zskip-rustdoc-fingerprint");
- 
-         // Only include compiler crates, no dependencies of those, such as `libc`.
-         // Do link to dependencies on `docs.rs` however using `rustdoc-map`.
-@@ -846,7 +844,6 @@ macro_rules! tool_doc {
-                     &[],
-                 );
- 
--                cargo.arg("-Zskip-rustdoc-fingerprint");
-                 // Only include compiler crates, no dependencies of those, such as `libc`.
-                 cargo.arg("--no-deps");
-                 $(
diff --git a/debian/patches/d-bootstrap-rustflags.patch b/debian/patches/d-bootstrap-rustflags.patch
index 30e826d81..792b05c82 100644
--- a/debian/patches/d-bootstrap-rustflags.patch
+++ b/debian/patches/d-bootstrap-rustflags.patch
@@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder.rs
 ===================================================================
 --- rust.orig/src/bootstrap/builder.rs
 +++ rust/src/bootstrap/builder.rs
-@@ -1409,6 +1409,18 @@ impl<'a> Builder<'a> {
+@@ -1385,6 +1385,18 @@ impl<'a> Builder<'a> {
              }
          }
  
diff --git a/debian/patches/d-bootstrap-use-local-css.patch b/debian/patches/d-bootstrap-use-local-css.patch
index 1ea9ac86a..080cc9b85 100644
--- a/debian/patches/d-bootstrap-use-local-css.patch
+++ b/debian/patches/d-bootstrap-use-local-css.patch
@@ -11,7 +11,7 @@ Index: rust/src/bootstrap/doc.rs
 ===================================================================
 --- rust.orig/src/bootstrap/doc.rs
 +++ rust/src/bootstrap/doc.rs
-@@ -360,7 +360,27 @@ impl Step for Standalone {
+@@ -350,7 +350,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);
-@@ -369,11 +389,6 @@ impl Step for Standalone {
+@@ -359,11 +379,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 3f4b1dbe6..1e9f272f1 100644
--- a/debian/patches/d-disable-download-tests.patch
+++ b/debian/patches/d-disable-download-tests.patch
@@ -2,7 +2,7 @@ Index: rust/src/bootstrap/config/tests.rs
 ===================================================================
 --- rust.orig/src/bootstrap/config/tests.rs
 +++ rust/src/bootstrap/config/tests.rs
-@@ -10,6 +10,9 @@ fn parse(config: &str) -> Config {
+@@ -13,6 +13,9 @@ fn parse(config: &str) -> Config {
  
  #[test]
  fn download_ci_llvm() {
@@ -12,7 +12,7 @@ Index: rust/src/bootstrap/config/tests.rs
      if crate::llvm::is_ci_llvm_modified(&parse("")) {
          eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
          return;
-@@ -38,7 +41,11 @@ fn download_ci_llvm() {
+@@ -41,7 +44,11 @@ fn download_ci_llvm() {
  //   - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487
  #[test]
  fn detect_src_and_out() {
diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch
index 99fd7e958..3431ebfff 100644
--- a/debian/patches/d-fix-rustix-outline.patch
+++ b/debian/patches/d-fix-rustix-outline.patch
@@ -12,7 +12,7 @@ Index: rust/vendor/rustix/build.rs
  use cc::Build;
  use std::env::var;
  use std::io::Write;
-@@ -162,16 +161,16 @@ fn link_in_librustix_outline(arch: &str,
+@@ -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.
@@ -36,7 +36,89 @@ Index: rust/vendor/rustix/Cargo.toml
 ===================================================================
 --- rust.orig/vendor/rustix/Cargo.toml
 +++ rust/vendor/rustix/Cargo.toml
-@@ -127,7 +127,6 @@ version = "3.4.0"
+@@ -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"
  
  [build-dependencies.cc]
  version = "1.0.68"
diff --git a/debian/patches/d-remove-arm-privacy-breaches.patch b/debian/patches/d-remove-arm-privacy-breaches.patch
deleted file mode 100644
index 7bd488a0e..000000000
--- a/debian/patches/d-remove-arm-privacy-breaches.patch
+++ /dev/null
@@ -1,195 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:38 +0200
-Subject: d-remove-arm-privacy-breaches
-
-===================================================================
----
- .../crates/stdarch-verify/arm-intrinsics.html      | 134 ---------------------
- 1 file changed, 134 deletions(-)
-
-Index: rust/library/stdarch/crates/stdarch-verify/arm-intrinsics.html
-===================================================================
---- rust.orig/library/stdarch/crates/stdarch-verify/arm-intrinsics.html
-+++ rust/library/stdarch/crates/stdarch-verify/arm-intrinsics.html
-@@ -20,17 +20,12 @@
- <meta name="keywords" content="">
- <meta content="Copyright &#169; 1995-2018 Arm Limited (or its affiliates). All rights reserved." name="copyright">
- <meta name="apple-mobile-web-app-capable" content="yes">
--<meta name="msapplication-config" content="https://developer.arm.com:443/shared/common/img/favicon/browserconfig.xml">
--<meta name="msapplication-TileColor" content="#2b5797">
--<meta name="msapplication-TileImage" content="https://developer.arm.com:443/shared/common/img/favicon/mstile-144x144.png">
- <meta name="theme-color" content="#ffffff">
- <meta name="server" content="ARMGPCD2" />
- 
- <meta property="og:title" content="Technologies | NEON Intrinsics Reference – Arm Developer">
- <meta property="og:description" content="All the NEON intrinsics reference in an interactive page.">
--<meta property="og:image" content="https://developer.arm.com:443">
- <meta property="og:site_name" content="ARM Developer">
--<meta property="og:url" content="https://developer.arm.com/technologies/neon/intrinsics">
- <meta property="og:type" content="website">
- <meta property="og:locale" content="en">
- 
-@@ -41,64 +36,14 @@
- <meta name="twitter:site" content="ARM Developer">
- <meta name="twitter:title" content="Technologies | NEON Intrinsics Reference – Arm Developer">
- <meta name="twitter:description" content="All the NEON intrinsics reference in an interactive page.">
--<meta name="twitter:image" content="https://developer.arm.com:443">
--<meta name="twitter:url" content="https://developer.arm.com/technologies/neon/intrinsics">
- 
- <meta itemprop="name" content="Technologies | NEON Intrinsics Reference – Arm Developer">
- <meta itemprop="description" content="All the NEON intrinsics reference in an interactive page.">
--<meta itemprop="image" content="https://developer.arm.com:443">
--
--
--    
--
--    <link rel="stylesheet" type="text/css" href="/shared/developer.arm.com/css/app.css?v=D41D8CD98F00B204E9800998ECF8427E" />
--
--    
--
--<link rel="apple-touch-icon" sizes="57x57" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="60x60" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="72x72" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="76x76" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="114x114" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="120x120" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="144x144" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="152x152" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="apple-touch-icon" sizes="180x180" href="https://developer.arm.com/shared/common/img/favicon/apple-touch-icon.png?v=2.29.0.0" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/favicon-32x32.png?v=2.29.0.0" sizes="32x32" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/favicon-48x48.png?v=2.29.0.0" sizes="48x48" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/android-chrome-192x192.png?v=2.29.0.0" sizes="192x192" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/android-chrome-256x256.png?v=2.29.0.0" sizes="256x256" />
--<link rel="icon" type="image/png" href="https://developer.arm.com/shared/common/img/favicon/favicon-16x16.png?v=2.29.0.0" sizes="16x16" />
--<link rel="shortcut icon" type="image/ico" href="https://developer.arm.com/shared/common/img/favicon/favicon.ico?v=2.29.0.0" />
--<link rel="manifest" href="https://developer.arm.com/shared/common/img/favicon/manifest.json?v=2.29.0.0" />
--
--    <link rel="search" type="application/opensearchdescription+xml" title="ARM Developer" href="/opensearch.xml"/>
--
--    
--    
--
--
--<!-- Google Tag Manager -->
--<script>
--(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
--new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
--j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
--'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
--    })(window, document, 'script', 'dataLayer', 'GTM-K25LQR');
--</script>
--<!-- End Google Tag Manager -->
--
--
- </head>
- <body id="">
-     
-     
- 
--<noscript>
--    <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-K25LQR" height="0" width="0" style="display:none;visibility:hidden"></iframe>
--</noscript>
--
--
-     
-     <div class="c-feedback-message-container u-no-print"><style>
- /* Docs top margin fix */
-@@ -245,7 +190,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'
-                             <span class="navigation-dropdown-label">
-                                 <a href="/">
-                                     <span>
--                                        <img src="/shared/developer.arm.com/img/arm-developer.svg" alt="ARM Developer" />
-                                     </span>
-                                     <i class="fa fa-caret-down"></i>
-                                 </a>
-@@ -437,7 +381,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'
- 
- </div>
- 
--<link rel="stylesheet" href="https://developer.arm.com/shared/arm-account/css/modules/user-menu.css?v=2.29.0.0" />
- 
-                         </li>
-                     </ul>
-@@ -93318,82 +93261,5 @@ names are the property of their respecti
-         
-     </div>
- 
--<script type="text/javascript" src="https://nebula-cdn.kampyle.com/we/8144/onsite/embed.js"></script>
--
--
--    
--
--<script src="/bundles/modernizr?v=inCVuEFe6J4Q07A0AcRsbJic_UE5MwpRMNGcOtk94TE1"></script>
--
--
--
--<script type="text/javascript">
--    if (Modernizr && !Modernizr.svg) {
--        var imgs = document.getElementsByTagName('img');
--        var svgExtension = /.*\.svg$/;
--        var l = imgs.length;
--        for (var i = 0; i < l; i++) {
--            if (imgs[i].src.match(svgExtension)) {
--                imgs[i].src = imgs[i].src.slice(0, -3) + 'png';
--            }
--        }
--    }
--</script>
--
--
--<script src="/shared/vendor/jquery-1.12.4.min.js"></script>
--<script src="/shared/vendor/foundation.min.js"></script>
--<script src="/shared/vendor/moment.min.js"></script>
--<script src="/shared/vendor/js/jquery-rss/src/jquery.rss.js"></script>
--
--<script src="/bundles/clipboard?v=IPc2U7tMxf_2TKh6_qbfzIsYI3pmBbWZxHb5M8V-fhg1"></script>
--
--<script src="/bundles/placeholder?v=Aw-bm4sJPSuBeTzPpRw_GfXYXI4wKmH607vgMic22c01"></script>
--
--<script src="/bundles/waypoints?v=E5Sm2NPVxzLqGyd5lIz-NjBvArn4w7w7IvCs35wz6dA1"></script>
--
--
--
--<script src="/shared/developer.arm.com/js/common.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--<script src="/shared/developer.arm.com/js/app.bundle.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--
--
--<script src="/shared/arm.com-new/js/app.constants.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--<script src="/shared/arm.com-new/js/app.navigation.js?v=09142182FF441DC932039AB1D8CD216F"></script>
--<script type="text/javascript">
--    (function() {
--        var $userMenu = $('.c-user-menu__root');
--        if ($userMenu) {
--            $userMenu.navigation();
--        }
--    })();
--</script>
--
--
--
--<script src="/bundles/jquery-ui?v=atr-jO-t-9RdxuVusckf7yNy0MEEBlVW5TaJCAetR6A1"></script>
--
--<script src="/bundles/jqueryval?v=shBfM8gvrYJt6eNs9xKMaOYfzyGdVGLhvPUMJ92MwmM1"></script>
--
--<script src="/sitecore%20modules/Web/Web%20Forms%20for%20Marketers/mvc/wffm.min.js"></script>
--<script>
--  $(document).ready(function() {
--    $("form[data-wffm]").each(function() { $(this).wffmForm(); });
--  });
--</script>
--
--<link rel="stylesheet" type="text/css" href="//fast.fonts.net/t/1.css?apiType=css&projectid=5616bfa5-8ba9-4061-8e15-3a2d29551ced" />
--
--
--<script src="//munchkin.marketo.net/munchkin.js" type="text/javascript"></script>
--<script type="text/javascript">
--    Munchkin.init('312-SAX-488', {'asyncOnly': true});
--</script>
--
--
--
--    
--    
--    
- </body>
- </html>
diff --git a/debian/patches/d-rustc-add-soname.patch b/debian/patches/d-rustc-add-soname.patch
index 03dc0ba6d..29c56a614 100644
--- a/debian/patches/d-rustc-add-soname.patch
+++ b/debian/patches/d-rustc-add-soname.patch
@@ -28,7 +28,7 @@ Index: rust/compiler/rustc_codegen_ssa/src/back/link.rs
 ===================================================================
 --- rust.orig/compiler/rustc_codegen_ssa/src/back/link.rs
 +++ rust/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -2359,6 +2359,13 @@ fn add_order_independent_options(
+@@ -2363,6 +2363,13 @@ fn add_order_independent_options(
      }
  
      add_rpath_args(cmd, sess, codegen_results, out_filename);
diff --git a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
deleted file mode 100644
index faee1685e..000000000
--- a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:39 +0200
-Subject: d-rustc-fix-mips64el-bootstrap
-
-Bug: https://github.com/rust-lang/rust/issues/52108
-
-===================================================================
----
- compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs   | 2 +-
- compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs | 2 +-
- src/bootstrap/bootstrap.py                                        | 2 ++
- src/test/assembly/asm/mips-types.rs                               | 1 +
- 4 files changed, 5 insertions(+), 2 deletions(-)
-
-Index: rust/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
-+++ rust/compiler/rustc_target/src/spec/mips64_unknown_linux_gnuabi64.rs
-@@ -12,7 +12,7 @@ pub fn target() -> Target {
-             endian: Endian::Big,
-             // NOTE(mips64r2) matches C toolchain
-             cpu: "mips64r2".into(),
--            features: "+mips64r2".into(),
-+            features: "+mips64r2,+xgot".into(),
-             max_atomic_width: Some(64),
-             mcount: "_mcount".into(),
- 
-Index: rust/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
-===================================================================
---- rust.orig/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
-+++ rust/compiler/rustc_target/src/spec/mips64el_unknown_linux_gnuabi64.rs
-@@ -10,7 +10,7 @@ pub fn target() -> Target {
-             abi: "abi64".into(),
-             // NOTE(mips64r2) matches C toolchain
-             cpu: "mips64r2".into(),
--            features: "+mips64r2".into(),
-+            features: "+mips64r2,+xgot".into(),
-             max_atomic_width: Some(64),
-             mcount: "_mcount".into(),
- 
-Index: rust/src/bootstrap/bootstrap.py
-===================================================================
---- rust.orig/src/bootstrap/bootstrap.py
-+++ rust/src/bootstrap/bootstrap.py
-@@ -877,6 +877,8 @@ class RustBuild(object):
- 
-         # preserve existing RUSTFLAGS
-         env.setdefault("RUSTFLAGS", "")
-+        if self.build_triple().startswith('mips'):
-+            env["RUSTFLAGS"] += " -Ctarget-feature=+xgot"
-         target_features = []
-         if self.get_toml("crt-static", build_section) == "true":
-             target_features += ["+crt-static"]
-Index: rust/tests/assembly/asm/mips-types.rs
-===================================================================
---- rust.orig/tests/assembly/asm/mips-types.rs
-+++ rust/tests/assembly/asm/mips-types.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // revisions: mips32 mips64
- // assembly-output: emit-asm
- //[mips32] compile-flags: --target mips-unknown-linux-gnu
diff --git a/debian/patches/d-rustdoc-disable-embedded-fonts.patch b/debian/patches/d-rustdoc-disable-embedded-fonts.patch
index 99fa7d251..7d8bab9f5 100644
--- a/debian/patches/d-rustdoc-disable-embedded-fonts.patch
+++ b/debian/patches/d-rustdoc-disable-embedded-fonts.patch
@@ -13,7 +13,7 @@ Index: rust/src/librustdoc/html/static/css/rustdoc.css
 ===================================================================
 --- rust.orig/src/librustdoc/html/static/css/rustdoc.css
 +++ rust/src/librustdoc/html/static/css/rustdoc.css
-@@ -79,14 +79,6 @@
+@@ -80,14 +80,6 @@
  	font-display: swap;
  }
  
diff --git a/debian/patches/series b/debian/patches/series
index 95572141b..006ad623d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,13 +41,11 @@ d-0012-cargo-always-return-dev-channel.patch
 ## Patches to the build process, including doc path tweaks
 ## Should not change resulting rustc behaviour
 d-bootstrap-rustflags.patch
-d-remove-arm-privacy-breaches.patch
 d-bootstrap-install-symlinks.patch
 d-bootstrap-disable-git.patch
 d-bootstrap-no-assume-tools.patch
 d-bootstrap-cargo-doc-paths.patch
 d-bootstrap-use-local-css.patch
-d-bootstrap-old-cargo-compat.patch
 d-bootstrap-custom-debuginfo-path.patch
 d-bootstrap-permit-symlink-in-docs.patch
 d-test-ignore-avx-44056.patch
@@ -63,7 +61,6 @@ d-armel-fix-lldb.patch
 d-rust-gdb-paths
 d-rust-lldb-paths
 d-rustc-add-soname.patch
-d-rustc-fix-mips64el-bootstrap.patch
 d-rustc-windows-ssp.patch
 d-rustc-i686-baseline.patch
 # Experimental patch not yet working
diff --git a/debian/patches/u-disable-fp-precision-test-on-i386.patch b/debian/patches/u-disable-fp-precision-test-on-i386.patch
index dad261349..d4845c9d0 100644
--- a/debian/patches/u-disable-fp-precision-test-on-i386.patch
+++ b/debian/patches/u-disable-fp-precision-test-on-i386.patch
@@ -15,7 +15,7 @@ Index: rust/library/core/src/num/f32.rs
 ===================================================================
 --- rust.orig/library/core/src/num/f32.rs
 +++ rust/library/core/src/num/f32.rs
-@@ -799,7 +799,7 @@ impl f32 {
+@@ -800,7 +800,7 @@ impl f32 {
      /// let angle = std::f32::consts::PI;
      ///
      /// let abs_difference = (angle.to_degrees() - 180.0).abs();
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch
index 4b5bcb6d5..1aff8de0f 100644
--- a/debian/patches/u-fix-get-toml-when-test.patch
+++ b/debian/patches/u-fix-get-toml-when-test.patch
@@ -10,7 +10,7 @@ Index: rust/src/bootstrap/config.rs
 ===================================================================
 --- rust.orig/src/bootstrap/config.rs
 +++ rust/src/bootstrap/config.rs
-@@ -931,9 +931,32 @@ impl Config {
+@@ -1040,9 +1040,32 @@ impl Config {
  
      pub fn parse(args: &[String]) -> Config {
          #[cfg(test)]
diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch
index f83e4fcbc..e7c1a3ced 100644
--- a/debian/patches/u-profiler.patch
+++ b/debian/patches/u-profiler.patch
@@ -14,9 +14,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
  src/bootstrap/config.rs            | 30 ++++++++++++++++++++++++------
  4 files changed, 38 insertions(+), 8 deletions(-)
 
---- a/config.example.toml
-+++ b/config.example.toml
-@@ -745,8 +745,10 @@ changelog-seen = 2
+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)
  
@@ -29,8 +31,10 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
  # This option will override the same option under [build] section.
  #profiler = build.profiler (bool)
  
---- a/library/profiler_builtins/build.rs
-+++ b/library/profiler_builtins/build.rs
+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;
  
@@ -44,9 +48,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
      let target = env::var("TARGET").expect("TARGET was not set");
      let cfg = &mut cc::Build::new();
  
---- a/src/bootstrap/compile.rs
-+++ b/src/bootstrap/compile.rs
-@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>,
+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);
      }
  
@@ -57,9 +63,11 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
      // 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
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -467,7 +467,7 @@ pub struct Target {
+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<PathBuf>,
      pub ndk: Option<PathBuf>,
      pub sanitizers: Option<bool>,
@@ -68,7 +76,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
      pub rpath: Option<bool>,
      pub crt_static: Option<bool>,
      pub musl_root: Option<PathBuf>,
-@@ -796,9 +796,9 @@ define_config! {
+@@ -862,9 +862,9 @@ define_config! {
      }
  }
  
@@ -80,7 +88,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
      String(String),
      Bool(bool),
  }
-@@ -809,6 +809,12 @@ impl Default for StringOrBool {
+@@ -976,6 +976,12 @@ define_config! {
      }
  }
  
@@ -91,9 +99,9 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
 +}
 +
  define_config! {
-     /// TOML representation of how the Rust build is configured.
-     struct Rust {
-@@ -880,7 +886,7 @@ define_config! {
+     /// TOML representation of how each build target is configured.
+     struct TomlTarget {
+@@ -991,7 +997,7 @@ define_config! {
          llvm_libunwind: Option<String> = "llvm-libunwind",
          android_ndk: Option<String> = "android-ndk",
          sanitizers: Option<bool> = "sanitizers",
@@ -102,7 +110,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
          rpath: Option<bool> = "rpath",
          crt_static: Option<bool> = "crt-static",
          musl_root: Option<String> = "musl-root",
-@@ -1744,12 +1750,24 @@ impl Config {
+@@ -1887,12 +1893,24 @@ impl Config {
          self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers
      }
  
diff --git a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
index faa70d7fa..341d5f0af 100644
--- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
+++ b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
@@ -20,7 +20,7 @@ Index: rust/compiler/rustc_lint/src/builtin.rs
 ===================================================================
 --- rust.orig/compiler/rustc_lint/src/builtin.rs
 +++ rust/compiler/rustc_lint/src/builtin.rs
-@@ -3102,7 +3102,10 @@ declare_lint! {
+@@ -3112,7 +3112,10 @@ declare_lint! {
      /// ### Example
      ///
      /// ```rust,compile_fail