Merging debian version 1.76.0+dfsg1-1.

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

8 files changed, 415 insertions, 251 deletions

diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/prune/d-0000-ignore-removed-submodules.patch
index 2ca3804d4..f3a7b7030 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/prune/d-0000-ignore-removed-submodules.patch
@@ -2,6 +2,10 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Date: Sat, 2 Oct 2021 01:07:59 +0100
 Subject: d-0000-ignore-removed-submodules
 
+Description: remove upstream parts that are not needed for the Debian build, in
+order to both reduce the orig tarball and the vendored crates within.
+
+Forwarded: not-needed
 ---
  Cargo.toml                                 |  7 ----
  src/bootstrap/bootstrap.py                 |  4 ---
@@ -38,10 +42,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 5a84e37..9bb09a6 100644
+index fea194a..ed99a47 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -969,10 +969,6 @@ class RustBuild(object):
+@@ -955,10 +955,6 @@ class RustBuild(object):
          args = [self.cargo(), "build", "--manifest-path",
                  os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
          args.extend("--verbose" for _ in range(self.verbose))
@@ -53,10 +57,10 @@ index 5a84e37..9bb09a6 100644
              args.append("--features")
              args.append("build-metrics")
 diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
-index d2aa89d..1ea2d93 100644
+index 4eb7766..5c115cf 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 {
+@@ -2295,17 +2295,7 @@ impl Step for RustcGuide {
      }
  
      fn run(self, builder: &Builder<'_>) {
@@ -76,11 +80,11 @@ index d2aa89d..1ea2d93 100644
  }
  
 diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
-index cd27667..2c870e9 100644
+index e180964..7245d11 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();
+         static SUBMODULES_PATHS: OnceLock<Vec<String>> = OnceLock::new();
  
          let init_submodules_paths = |src: &PathBuf| {
 -            let file = File::open(src.join(".gitmodules")).unwrap();
@@ -175,7 +179,7 @@ index cd27667..2c870e9 100644
                  doc::EmbeddedBook,
                  doc::EditionGuide,
                  doc::StyleGuide,
-@@ -823,12 +804,9 @@ impl<'a> Builder<'a> {
+@@ -824,12 +805,9 @@ impl<'a> Builder<'a> {
                  dist::Analysis,
                  dist::Src,
                  dist::Cargo,
@@ -188,7 +192,7 @@ index cd27667..2c870e9 100644
                  dist::LlvmTools,
                  dist::RustDev,
                  dist::Bootstrap,
-@@ -845,11 +823,9 @@ impl<'a> Builder<'a> {
+@@ -846,11 +824,9 @@ impl<'a> Builder<'a> {
                  install::Docs,
                  install::Std,
                  install::Cargo,
@@ -200,7 +204,7 @@ index cd27667..2c870e9 100644
                  install::LlvmTools,
                  install::Src,
                  install::Rustc
-@@ -859,7 +835,6 @@ impl<'a> Builder<'a> {
+@@ -860,7 +836,6 @@ impl<'a> Builder<'a> {
                  run::BuildManifest,
                  run::BumpStage0,
                  run::ReplaceVersionPlaceholder,
@@ -208,7 +212,7 @@ index cd27667..2c870e9 100644
                  run::CollectLicenseMetadata,
                  run::GenerateCopyright,
                  run::GenerateWindowsSys,
-@@ -2045,10 +2020,7 @@ impl<'a> Builder<'a> {
+@@ -2080,10 +2055,7 @@ impl<'a> Builder<'a> {
              }
          }
  
@@ -221,7 +225,7 @@ index cd27667..2c870e9 100644
          }
  
 diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
-index cab88fc..5bac437 100644
+index 1213979..71f9aa7 100644
 --- a/src/tools/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/Cargo.toml
 @@ -1,5 +1,14 @@
diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/prune/d-0001-pkg-config-no-special-snowflake.patch
index bae687742..13e1cceda 100644
--- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
+++ b/debian/patches/prune/d-0001-pkg-config-no-special-snowflake.patch
@@ -2,6 +2,9 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Date: Sat, 2 Oct 2021 01:08:00 +0100
 Subject: d-0001-pkg-config-no-special-snowflake
 
+Description: always enable cross compilation via pkgconf, and set the right binary name.
+
+Forwarded: not-needed
 ---
  vendor/pkg-config/src/lib.rs    | 25 ++++++++++---------------
  vendor/pkg-config/tests/test.rs |  2 --
diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/prune/d-0002-mdbook-strip-embedded-libs.patch
index 6e7914c45..62d97a13f 100644
--- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
+++ b/debian/patches/prune/d-0002-mdbook-strip-embedded-libs.patch
@@ -2,17 +2,140 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Date: Sat, 2 Oct 2021 01:08:00 +0100
 Subject: d-0002-mdbook-strip-embedded-libs
 
-Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase the patch on top of a newer version. . Make sure the paths here match the ones in debian/rust-doc.links
+Description: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase
+the patch on top of a newer version. . Make sure the paths here match the ones
+in debian/rust-doc.links
+
+Forwarded: not-needed
 ---
+ src/doc/rust-by-example/theme/index.hbs            |  86 +----------------
  src/tools/linkchecker/main.rs                      |  28 +++++-
  vendor/mdbook/src/book/init.rs                     |  19 ----
  .../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/index.hbs                  |  86 +----------------
  vendor/mdbook/src/theme/mod.rs                     |  27 ------
  vendor/mdbook/src/theme/searcher/mod.rs            |   2 -
- 7 files changed, 47 insertions(+), 234 deletions(-)
+ 8 files changed, 51 insertions(+), 303 deletions(-)
 
+diff --git a/src/doc/rust-by-example/theme/index.hbs b/src/doc/rust-by-example/theme/index.hbs
+index 1ae579f..effac81 100644
+--- a/src/doc/rust-by-example/theme/index.hbs
++++ b/src/doc/rust-by-example/theme/index.hbs
+@@ -33,10 +33,7 @@
+         {{/if}}
+ 
+         <!-- Fonts -->
+-        <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+-        {{#if copy_fonts}}
+-        <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
+-        {{/if}}
++        <link rel="stylesheet" href="{{ path_to_root }}css/font-awesome.min.css">
+ 
+         <!-- Highlight.js Stylesheets -->
+         <link rel="stylesheet" href="{{ path_to_root }}highlight.css">
+@@ -50,7 +47,7 @@
+ 
+         {{#if mathjax_support}}
+         <!-- MathJax -->
+-        <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
++        <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+         {{/if}}
+     </head>
+     <body class="sidebar-visible no-js">
+@@ -61,35 +58,6 @@
+             var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
+         </script>
+ 
+-        <!-- Work around some values being stored in localStorage wrapped in quotes -->
+-        <script>
+-            try {
+-                var theme = localStorage.getItem('mdbook-theme');
+-                var sidebar = localStorage.getItem('mdbook-sidebar');
+-
+-                if (theme.startsWith('"') && theme.endsWith('"')) {
+-                    localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
+-                }
+-
+-                if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
+-                    localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
+-                }
+-            } catch (e) { }
+-        </script>
+-
+-        <!-- Set the theme before any content is loaded, prevents flash -->
+-        <script>
+-            var theme;
+-            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
+-            if (theme === null || theme === undefined) { theme = default_theme; }
+-            var html = document.querySelector('html');
+-            html.classList.remove('{{ default_theme }}')
+-            html.classList.add(theme);
+-            var body = document.querySelector('body');
+-            body.classList.remove('no-js')
+-            body.classList.add('js');
+-        </script>
+-
+         <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+ 
+         <!-- Hide / unhide sidebar before it is displayed -->
+@@ -309,54 +277,8 @@
+         </script>
+         {{/if}}
+ 
+-        {{#if google_analytics}}
+-        <!-- Google Analytics Tag -->
+-        <script>
+-            var localAddrs = ["localhost", "127.0.0.1", ""];
+-
+-            // make sure we don't activate google analytics if the developer is
+-            // inspecting the book locally...
+-            if (localAddrs.indexOf(document.location.hostname) === -1) {
+-                (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+-                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+-                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+-                })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+-
+-                ga('create', '{{google_analytics}}', 'auto');
+-                ga('send', 'pageview');
+-            }
+-        </script>
+-        {{/if}}
+-
+-        {{#if playground_line_numbers}}
+-        <script>
+-            window.playground_line_numbers = true;
+-        </script>
+-        {{/if}}
+-
+-        {{#if playground_copyable}}
+-        <script>
+-            window.playground_copyable = true;
+-        </script>
+-        {{/if}}
+-
+-        {{#if playground_js}}
+-        <script src="{{ path_to_root }}ace.js"></script>
+-        <script src="{{ path_to_root }}editor.js"></script>
+-        <script src="{{ path_to_root }}mode-rust.js"></script>
+-        <script src="{{ path_to_root }}theme-dawn.js"></script>
+-        <script src="{{ path_to_root }}theme-tomorrow_night.js"></script>
+-        {{/if}}
+-
+-        {{#if search_js}}
+-        <script src="{{ path_to_root }}elasticlunr.min.js"></script>
+-        <script src="{{ path_to_root }}mark.min.js"></script>
+-        <script src="{{ path_to_root }}searcher.js"></script>
+-        {{/if}}
+-
+-        <script src="{{ path_to_root }}clipboard.min.js"></script>
+-        <script src="{{ path_to_root }}highlight.js"></script>
+-        <script src="{{ path_to_root }}book.js"></script>
++        <script src="{{ path_to_root }}highlight.js" type="text/javascript" charset="utf-8"></script>
++        <script src="{{ path_to_root }}book.js" type="text/javascript" charset="utf-8"></script>
+ 
+         <!-- Custom JS scripts -->
+         {{#each additional_js}}
 diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
 index 7f73cac..e4805cc 100644
 --- a/src/tools/linkchecker/main.rs
@@ -97,7 +220,7 @@ index faca1d0..c1a82a3 100644
      }
  
 diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-index 709aa06..17ff63c 100644
+index 8ea2f49..3cb1c9f 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, Code, Config, HtmlConfig, Playground, RustEditio
@@ -245,7 +368,7 @@ index 24d62fd..849a48c 100644
      }
  
 diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs
-index 80315c4..48413b0 100644
+index 080b785..f6064f6 100644
 --- a/vendor/mdbook/src/theme/index.hbs
 +++ b/vendor/mdbook/src/theme/index.hbs
 @@ -33,10 +33,7 @@
@@ -268,8 +391,8 @@ index 80315c4..48413b0 100644
 +        <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
          {{/if}}
      </head>
-     <body>
-@@ -61,48 +58,6 @@
+     <body class="sidebar-visible no-js">
+@@ -61,35 +58,6 @@
              var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
          </script>
  
@@ -295,30 +418,17 @@ index 80315c4..48413b0 100644
 -            try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
 -            if (theme === null || theme === undefined) { theme = default_theme; }
 -            var html = document.querySelector('html');
--            html.classList.remove('no-js')
 -            html.classList.remove('{{ default_theme }}')
 -            html.classList.add(theme);
--            html.classList.add('js');
+-            var body = document.querySelector('body');
+-            body.classList.remove('no-js')
+-            body.classList.add('js');
 -        </script>
 -
--        <!-- Hide / unhide sidebar before it is displayed -->
--        <script>
--            var html = document.querySelector('html');
--            var sidebar = null;
--            if (document.body.clientWidth >= 1080) {
--                try { sidebar = localStorage.getItem('mdbook-sidebar'); } catch(e) { }
--                sidebar = sidebar || 'visible';
--            } else {
--                sidebar = 'hidden';
--            }
--            html.classList.remove('sidebar-visible');
--            html.classList.add("sidebar-" + sidebar);
--        </script>
--
-         <nav id="sidebar" class="sidebar" aria-label="Table of contents">
-             <div class="sidebar-scrollbox">
-                 {{#toc}}{{/toc}}
-@@ -262,54 +217,8 @@
+         <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
+ 
+         <!-- Hide / unhide sidebar before it is displayed -->
+@@ -269,54 +237,8 @@
          </script>
          {{/if}}
  
diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/prune/d-0005-no-jemalloc.patch
index 1ff501dc3..611b87028 100644
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/prune/d-0005-no-jemalloc.patch
@@ -2,6 +2,9 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Date: Sat, 2 Oct 2021 01:08:00 +0100
 Subject: d-0005-no-jemalloc
 
+Description: remove jemalloc-sys
+
+Forwarded: not-needed
 ---
  compiler/rustc/Cargo.toml                         | 6 ------
  src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 --
@@ -27,12 +30,12 @@ index 3cb56a7..af37dfc 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 937834a..fd98d85 100644
+index 56ce9d1..4fb2760 100644
 --- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
 @@ -17,7 +17,6 @@ cfg-if = "1.0.0"
- libc = "0.2.135"
  la-arena.workspace = true
+ libc.workspace = true
  countme = { version = "3.0.1", features = ["enable"] }
 -jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
  
diff --git a/debian/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch b/debian/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch
new file mode 100644
index 000000000..30b3198b4
--- /dev/null
+++ b/debian/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch
@@ -0,0 +1,39 @@
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Mon, 6 May 2024 10:25:32 +0200
+Subject: d-0010-cargo-remove-vendored-c-crates
+
+Description: remove all vendoring features of crates normally shipping bundled
+C libs. that C code is stripped when repacking, so the features can't work
+anyway.
+Last-Update: 2023-05-17
+
+Forwarded: not-needed
+---
+ src/tools/cargo/Cargo.toml | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
+index c07b004..2a81642 100644
+--- a/src/tools/cargo/Cargo.toml
++++ b/src/tools/cargo/Cargo.toml
+@@ -73,7 +73,7 @@ proptest = "1.4.0"
+ pulldown-cmark = { version = "0.9.3", default-features = false }
+ rand = "0.8.5"
+ regex = "1.10.2"
+-rusqlite = { version = "0.30.0", features = ["bundled"] }
++rusqlite = { version = "0.30.0", features = [] }
+ rustfix = { version = "0.7.0", path = "crates/rustfix" }
+ same-file = "1.0.6"
+ security-framework = "2.9.2"
+@@ -243,10 +243,8 @@ test = false
+ doc = false
+ 
+ [features]
+-vendored-openssl = ["openssl/vendored"]
+-vendored-libgit2 = ["libgit2-sys/vendored"]
++# Debian: removed vendoring flags
+ # This is primarily used by rust-lang/rust distributing cargo the executable.
+-all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx', 'vendored-libgit2']
+ 
+ [lints]
+ workspace = true
diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/prune/d-0011-cargo-remove-nghttp2.patch
index e5d78db0c..3255e98fc 100644
--- a/debian/patches/d-0011-cargo-remove-nghttp2.patch
+++ b/debian/patches/prune/d-0011-cargo-remove-nghttp2.patch
@@ -2,13 +2,17 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Date: Mon, 6 May 2024 10:25:32 +0200
 Subject: d-0011-cargo-remove-nghttp2
 
-Last-Update: 2023-05-17 <YYYY-MM-DD, last update of the meta-information, optional>
+Description: remove dependency on libnghttp2-sys so it can be pruned.
+
+Last-Update: 2023-05-17
+
+Forwarded: not-needed
 ---
  vendor/curl-sys/Cargo.toml | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml
-index 9149121..b36d525 100644
+index daf925e..624fabf 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-0020-remove-windows-dependencies.patch b/debian/patches/prune/d-0020-remove-windows-dependencies.patch
index dd4f4d88d..29604db35 100644
--- a/debian/patches/d-0020-remove-windows-dependencies.patch
+++ b/debian/patches/prune/d-0020-remove-windows-dependencies.patch
@@ -2,33 +2,44 @@ From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
 Date: Mon, 6 May 2024 10:25:32 +0200
 Subject: d-0020-remove-windows-dependencies
 
+use something like
+
+ find src compiler library -iname Cargo.toml -exec grep -H -n -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \; >
+
+to find and eliminate dependencies on windows-only crates when rebasing.
+
+windows-bindgen and windows-metadata should not be removed, they are needed for
+the build and don't pull in windows-sys and friends.
+
+Forwarded: not-needed
+
 ===================================================================
 ---
  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 ++++------------------
+ 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                         | 26 ++++------------------
  .../cargo/crates/cargo-test-support/Cargo.toml     |  3 ---
- src/tools/cargo/crates/cargo-util/Cargo.toml       |  7 -------
+ 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/compiletest/Cargo.toml                   | 10 ---------
  src/tools/rust-analyzer/crates/profile/Cargo.toml  |  3 ---
- .../rust-analyzer/crates/rust-analyzer/Cargo.toml  |  6 ------
+ .../rust-analyzer/crates/rust-analyzer/Cargo.toml  |  6 -----
  src/tools/rust-analyzer/crates/stdx/Cargo.toml     |  4 ----
- 17 files changed, 4 insertions(+), 126 deletions(-)
+ 17 files changed, 4 insertions(+), 129 deletions(-)
 
 diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
-index 4dae49f..20453c2 100644
+index 3f2ed25..bf0ad91 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.32.0"
+ version = "0.32.1"
  default-features = false
  features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"]
 -
@@ -36,7 +47,7 @@ index 4dae49f..20453c2 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 8d91c4c..0de63d9 100644
+index 4732783..bbfcb55 100644
 --- a/compiler/rustc_data_structures/Cargo.toml
 +++ b/compiler/rustc_data_structures/Cargo.toml
 @@ -32,16 +32,6 @@ tracing = "0.1"
@@ -57,10 +68,10 @@ index 8d91c4c..0de63d9 100644
  # tidy-alphabetical-start
  memmap2 = "0.2.1"
 diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
-index da7c244..80547ce 100644
+index 4904298..2918095 100644
 --- a/compiler/rustc_driver_impl/Cargo.toml
 +++ b/compiler/rustc_driver_impl/Cargo.toml
-@@ -58,12 +58,6 @@ tracing = { version = "0.1.35" }
+@@ -59,12 +59,6 @@ tracing = { version = "0.1.35" }
  libc = "0.2"
  # tidy-alphabetical-end
  
@@ -139,10 +150,10 @@ index 932310b..dce3c3f 100644
  
  [[example]]
 diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
-index e4d3591..b548faf 100644
+index 077d195..b9ad241 100644
 --- a/src/bootstrap/Cargo.toml
 +++ b/src/bootstrap/Cargo.toml
-@@ -66,21 +66,6 @@ sysinfo = { version = "0.26.0", optional = true }
+@@ -65,21 +65,6 @@ sysinfo = { version = "0.26.0", optional = true }
  [target.'cfg(not(target_os = "solaris"))'.dependencies]
  fd-lock = "3.0.13"
  
@@ -165,7 +176,7 @@ index e4d3591..b548faf 100644
  pretty_assertions = "1.4"
  
 diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
-index c011909..989d8d4 100644
+index 2a81642..76a8cf2 100644
 --- a/src/tools/cargo/Cargo.toml
 +++ b/src/tools/cargo/Cargo.toml
 @@ -2,7 +2,9 @@
@@ -181,22 +192,22 @@ index c011909..989d8d4 100644
  ]
 @@ -24,8 +26,6 @@ bytesize = "1.3"
  cargo = { path = "" }
- 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-credential = { version = "0.4.2", path = "credential/cargo-credential" }
+ cargo-credential-libsecret = { version = "0.4.2", path = "credential/cargo-credential-libsecret" }
+-cargo-credential-macos-keychain = { version = "0.4.2", path = "credential/cargo-credential-macos-keychain" }
+-cargo-credential-wincred = { version = "0.4.2", 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" }
-@@ -102,7 +102,6 @@ unicode-xid = "0.2.4"
- url = "2.4.1"
+@@ -103,7 +103,6 @@ unicode-xid = "0.2.4"
+ url = "2.5.0"
  varisat = "0.2.2"
  walkdir = "2.4.0"
--windows-sys = "0.48"
+-windows-sys = "0.52"
  
- [package]
- name = "cargo"
-@@ -129,6 +128,7 @@ base64.workspace = true
+ [workspace.lints.rust]
+ rust_2018_idioms = "warn" # TODO: could this be removed?
+@@ -144,6 +143,7 @@ base64.workspace = true
  bytesize.workspace = true
  cargo-credential.workspace = true
  cargo-platform.workspace = true
@@ -204,7 +215,7 @@ index c011909..989d8d4 100644
  cargo-util.workspace = true
  clap = { workspace = true, features = ["wrap_help"] }
  color-print.workspace = true
-@@ -189,9 +189,6 @@ walkdir.workspace = true
+@@ -206,27 +206,9 @@ walkdir.workspace = true
  [target.'cfg(target_os = "linux")'.dependencies]
  cargo-credential-libsecret.workspace = true
  
@@ -214,10 +225,6 @@ index c011909..989d8d4 100644
  [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
 -
@@ -237,47 +244,53 @@ index c011909..989d8d4 100644
  cargo-test-macro.workspace = true
  cargo-test-support.workspace = true
 diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
-index fc32e1c..ce5d708 100644
+index 1098d59..88d4ae7 100644
 --- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml
 +++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
-@@ -29,6 +29,3 @@ tar.workspace = true
- time.workspace = true
- toml.workspace = true
+@@ -31,8 +31,5 @@ toml.workspace = true
  url.workspace = true
--
+ walkdir.workspace = true
+ 
 -[target.'cfg(windows)'.dependencies]
 -windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] }
+-
+ [lints]
+ workspace = true
 diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml
-index 616a79c..9fc3971 100644
+index 3fd6bde..fb681a3 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
- tempfile.workspace = true
+@@ -22,12 +22,5 @@ tempfile.workspace = true
  tracing.workspace = true
  walkdir.workspace = true
--
+ 
 -[target.'cfg(target_os = "macos")'.dependencies]
 -core-foundation.workspace = true
 -
 -[target.'cfg(windows)'.dependencies]
 -miow.workspace = true
 -windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] }
+-
+ [lints]
+ workspace = true
 diff --git a/src/tools/cargo/crates/home/Cargo.toml b/src/tools/cargo/crates/home/Cargo.toml
-index 702a14e..dafeec8 100644
+index 33cd6ba..2d5dfdc 100644
 --- a/src/tools/cargo/crates/home/Cargo.toml
 +++ b/src/tools/cargo/crates/home/Cargo.toml
-@@ -15,6 +15,3 @@ include = [
- license.workspace = true
+@@ -16,8 +16,5 @@ license.workspace = true
  repository = "https://github.com/rust-lang/cargo"
  description = "Shared definitions of home directories."
--
+ 
 -[target.'cfg(windows)'.dependencies]
--windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell"] }
+-windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell", "Win32_System_Com"] }
+-
+ [lints]
+ workspace = true
 diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml
-index 8ba65b8..6678c23 100644
+index 7dc37ff..fac049b 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
+@@ -15,9 +15,6 @@ serde_json.workspace = true
  thiserror.workspace = true
  time.workspace = true
  
@@ -286,6 +299,7 @@ index 8ba65b8..6678c23 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 c2f8186..c420971 100644
 --- a/src/tools/cargo/src/cargo/util/auth/mod.rs
@@ -321,7 +335,7 @@ index 31c6353..bdc4805 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..8c1d137 100644
+index 4fb2760..8573fbe 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"] }
@@ -335,10 +349,10 @@ index fd98d85..8c1d137 100644
  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 7410f0a..d25b922 100644
+index 39ac338a..d25722a 100644
 --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-@@ -71,12 +71,6 @@ toolchain.workspace = true
+@@ -65,12 +65,6 @@ toolchain.workspace = true
  vfs-notify.workspace = true
  vfs.workspace = true
  
@@ -350,17 +364,17 @@ index 7410f0a..d25b922 100644
 -
  [dev-dependencies]
  expect-test = "1.4.0"
- xshell = "0.2.2"
+ xshell.workspace = true
 diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-index 536f000..6ed37f5 100644
+index c914ae2..db8b274 100644
 --- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-@@ -19,10 +19,6 @@ jod-thread = "0.1.2"
- crossbeam-channel = "0.5.5"
+@@ -20,10 +20,6 @@ crossbeam-channel = "0.5.5"
+ itertools.workspace = true
  # Think twice before adding anything here
  
 -[target.'cfg(windows)'.dependencies]
--miow = "0.5.0"
+-miow = "0.6.0"
 -winapi = { version = "0.3.9", features = ["winerror"] }
 -
  [features]
diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/prune/d-0021-vendor-remove-windows-dependencies.patch
index 895d091b8..025cfd8bd 100644
--- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
+++ b/debian/patches/prune/d-0021-vendor-remove-windows-dependencies.patch
@@ -5,66 +5,72 @@ MIME-Version: 1.0
 Content-Type: text/plain; charset="utf-8"
 Content-Transfer-Encoding: 8bit
 
+use something like
+
+ find vendor -iname Cargo.toml -exec grep -H -n -e 'windows-sys' -e 'winapi' -e 'ntapi' -e 'wincon' -e 'winreg' -e 'windows' {} \; > /tmp/files
+
+to find dependencies on windows targets in vendored crates. you will likely
+need to remove some hunks from this patch after pruning dependencies, since
+hopefully a few of the crates patched during early rebasing are eliminated.
+
+windows-bindgen and windows-metadata should not be removed, they are needed for
+the build and don't pull in windows-sys and friends.
+
+Forwarded: not-needed
+
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- vendor/android-tzdata/Cargo.toml         |  1 +
- vendor/ansi_term/Cargo.toml              |  3 ---
- vendor/anstream/Cargo.toml               |  7 ------
- vendor/anstyle-query/Cargo.toml          |  7 ------
- vendor/atty/Cargo.toml                   |  3 ---
- vendor/backtrace/Cargo.toml              | 14 -----------
- vendor/chrono/Cargo.toml                 | 12 ----------
- vendor/colored/Cargo.toml                |  7 ------
- vendor/console/Cargo.toml                | 11 ---------
- vendor/curl-sys/Cargo.toml               |  7 ------
- vendor/curl/Cargo.toml                   | 10 --------
- 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/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 ---
- vendor/mio/Cargo.toml                    | 11 ---------
- vendor/native-tls/Cargo.toml             |  3 ---
- vendor/nu-ansi-term/Cargo.toml           | 10 --------
- vendor/opener-0.5.2/Cargo.toml           |  4 ----
- vendor/opener/Cargo.toml                 |  9 -------
- vendor/os_info/Cargo.toml                | 15 ------------
- 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 -----
- vendor/socket2/Cargo.toml                |  8 -------
- vendor/stacker/Cargo.toml                | 10 --------
- vendor/sysinfo-0.26.7/Cargo.toml         | 38 -----------------------------
- vendor/sysinfo/Cargo.toml                | 41 --------------------------------
- vendor/tempfile-3.8.0/Cargo.toml         |  7 ------
- vendor/tempfile/Cargo.toml               |  7 ------
- vendor/term/Cargo.toml                   |  6 -----
- vendor/termcolor/Cargo.toml              |  3 ---
- vendor/terminal_size/Cargo.toml          |  7 ------
- vendor/termize/Cargo.toml                |  3 ---
- vendor/tokio-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 ---
- 58 files changed, 1 insertion(+), 495 deletions(-)
+ vendor/android-tzdata/Cargo.toml      |  1 +
+ vendor/ansi_term/Cargo.toml           |  3 ---
+ vendor/anstream-0.5.0/Cargo.toml      |  5 -----
+ vendor/anstream/Cargo.toml            |  7 ------
+ vendor/anstyle-query/Cargo.toml       |  6 -----
+ vendor/backtrace/Cargo.toml           | 14 ------------
+ vendor/chrono/Cargo.toml              | 12 ----------
+ vendor/colored/Cargo.toml             |  7 ------
+ vendor/console/Cargo.toml             | 11 ----------
+ vendor/ctrlc/Cargo.toml               | 17 ---------------
+ vendor/curl-sys/Cargo.toml            |  7 ------
+ vendor/curl/Cargo.toml                | 10 ---------
+ vendor/dirs-sys-0.3.7/Cargo.toml      |  3 ---
+ vendor/dirs-sys-next/Cargo.toml       |  3 ---
+ vendor/errno/Cargo.toml               |  6 -----
+ vendor/fd-lock/Cargo.toml             |  8 -------
+ vendor/filetime/Cargo.toml            |  7 ------
+ vendor/gix-sec/Cargo.toml             | 12 ----------
+ vendor/home/Cargo.toml                |  7 ------
+ vendor/iana-time-zone/Cargo.toml      |  4 ----
+ vendor/ignore/Cargo.toml              |  2 --
+ vendor/is-terminal/Cargo.toml         | 11 ----------
+ vendor/libloading-0.7.4/Cargo.toml    |  6 -----
+ vendor/libloading/Cargo.toml          |  8 -------
+ vendor/libssh2-sys/Cargo.toml         |  8 -------
+ vendor/mio/Cargo.toml                 | 11 ----------
+ vendor/native-tls/Cargo.toml          |  3 ---
+ vendor/nu-ansi-term-0.46.0/Cargo.toml | 10 ---------
+ vendor/opener-0.5.2/Cargo.toml        |  4 ----
+ vendor/opener/Cargo.toml              |  9 --------
+ vendor/os_info/Cargo.toml             | 15 -------------
+ vendor/parking_lot_core/Cargo.toml    |  3 ---
+ vendor/reqwest/Cargo.toml             |  3 ---
+ vendor/rustix/Cargo.toml              | 17 ---------------
+ vendor/same-file/Cargo.toml           |  2 --
+ vendor/snapbox/Cargo.toml             |  6 -----
+ vendor/socket2/Cargo.toml             |  7 ------
+ vendor/stacker/Cargo.toml             | 10 ---------
+ vendor/sysinfo-0.26.7/Cargo.toml      | 38 --------------------------------
+ vendor/sysinfo/Cargo.toml             | 41 -----------------------------------
+ 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-native-tls/Cargo.toml    | 17 ---------------
+ vendor/tokio/Cargo.toml               | 21 ------------------
+ vendor/uuid/Cargo.toml                |  4 ----
+ vendor/walkdir/Cargo.toml             |  3 ---
+ vendor/yansi-term/Cargo.toml          |  3 ---
+ 50 files changed, 1 insertion(+), 437 deletions(-)
 
 diff --git a/vendor/android-tzdata/Cargo.toml b/vendor/android-tzdata/Cargo.toml
 index 805128a..0682717 100644
@@ -86,65 +92,51 @@ index 0e5feba..3256c75 100644
 -[target."cfg(target_os=\"windows\")".dependencies.winapi]
 -version = "0.3.4"
 -features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"]
-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 = [
+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",
  ]
--test = []
 -wincon = ["dep:anstyle-wincon"]
--
+ 
 -[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "3.0.1"
+-version = "2.0.0"
 -optional = true
-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 = [
+diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml
+index a64ec8d..34dd08f 100644
+--- a/vendor/anstream/Cargo.toml
++++ b/vendor/anstream/Cargo.toml
+@@ -134,11 +134,4 @@ auto = [
  ]
  default = [
      "auto",
 -    "wincon",
  ]
+-test = []
 -wincon = ["dep:anstyle-wincon"]
- 
+-
 -[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "2.0.0"
+-version = "3.0.1"
 -optional = true
 diff --git a/vendor/anstyle-query/Cargo.toml b/vendor/anstyle-query/Cargo.toml
-index 63a431c..0cf859b 100644
+index 599e364..e32bc63 100644
 --- a/vendor/anstyle-query/Cargo.toml
 +++ b/vendor/anstyle-query/Cargo.toml
-@@ -70,10 +70,3 @@ replace = """
- <!-- next-url -->
+@@ -72,9 +72,3 @@ replace = """
  [Unreleased]: https://github.com/rust-cli/anstyle/compare/{{tag_name}}...HEAD"""
- exactly = 1
--
+ search = "<!-- next-url -->"
+ 
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.48.0"
+-version = "0.52.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
-+++ b/vendor/atty/Cargo.toml
-@@ -27,8 +27,5 @@ version = "0.1.6"
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
- default-features = false
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"]
- [badges.travis-ci]
- repository = "softprops/atty"
 diff --git a/vendor/backtrace/Cargo.toml b/vendor/backtrace/Cargo.toml
 index c13e7ee..7b01a6f 100644
 --- a/vendor/backtrace/Cargo.toml
@@ -217,7 +209,7 @@ index dda2951..05b76bd 100644
 -    "Win32_System_Console",
 -]
 diff --git a/vendor/console/Cargo.toml b/vendor/console/Cargo.toml
-index 85849e1..7c7be5a 100644
+index 85849e16..7c7be5a 100644
 --- a/vendor/console/Cargo.toml
 +++ b/vendor/console/Cargo.toml
 @@ -59,14 +59,3 @@ default = [
@@ -235,8 +227,36 @@ index 85849e1..7c7be5a 100644
 -    "Win32_Storage_FileSystem",
 -    "Win32_UI_Input_KeyboardAndMouse",
 -]
+diff --git a/vendor/ctrlc/Cargo.toml b/vendor/ctrlc/Cargo.toml
+index bb27f1b..93d7d7e 100644
+--- a/vendor/ctrlc/Cargo.toml
++++ b/vendor/ctrlc/Cargo.toml
+@@ -56,23 +56,6 @@ features = [
+ ]
+ default-features = false
+ 
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48"
+-features = [
+-    "Win32_Foundation",
+-    "Win32_System_Threading",
+-    "Win32_Security",
+-    "Win32_System_Console",
+-]
+-
+-[target."cfg(windows)".dev-dependencies.windows-sys]
+-version = "0.48"
+-features = [
+-    "Win32_Storage_FileSystem",
+-    "Win32_Foundation",
+-    "Win32_System_IO",
+-    "Win32_System_Console",
+-]
+ 
+ [badges.maintenance]
+ status = "passively-maintained"
 diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml
-index b36d525..4b5cee1 100644
+index 624fabf..c66bbba 100644
 --- a/vendor/curl-sys/Cargo.toml
 +++ b/vendor/curl-sys/Cargo.toml
 @@ -73,13 +73,6 @@ zlib-ng-compat = [
@@ -299,7 +319,7 @@ index e9d8d0c..acb2eb7 100644
  [badges.maintenance]
  status = "as-is"
 diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml
-index d35ef19..e5e18a3 100644
+index e1d0bf5..60eeb86 100644
 --- a/vendor/errno/Cargo.toml
 +++ b/vendor/errno/Cargo.toml
 @@ -41,9 +41,3 @@ default-features = false
@@ -307,7 +327,7 @@ index d35ef19..e5e18a3 100644
  default-features = false
  
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.48"
+-version = "0.52"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_System_Diagnostics_Debug",
@@ -329,30 +349,30 @@ index 8d0b8f0..eb1ef13 100644
 -    "Win32_System_IO",
 -]
 diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml
-index 5c28c6c..b32fbcc 100644
+index 0540ffb..2c65fa5 100644
 --- a/vendor/filetime/Cargo.toml
 +++ b/vendor/filetime/Cargo.toml
-@@ -38,10 +38,3 @@ version = "0.3.5"
+@@ -38,10 +38,3 @@ version = "0.4.1"
  
  [target."cfg(unix)".dependencies.libc]
  version = "0.2.27"
 -
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.48.0"
+-version = "0.52.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_Storage_FileSystem",
 -]
 diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml
-index 8605b90..9db4399 100644
+index cf452ec..c405340 100644
 --- a/vendor/gix-sec/Cargo.toml
 +++ b/vendor/gix-sec/Cargo.toml
-@@ -63,15 +63,3 @@ serde = [
+@@ -58,15 +58,3 @@ serde = [
  [target."cfg(not(windows))".dependencies.libc]
  version = "0.2.123"
  
 -[target."cfg(windows)".dependencies.gix-path]
--version = "^0.10.0"
+-version = "^0.10.1"
 -
 -[target."cfg(windows)".dependencies.windows]
 -version = "0.48"
@@ -391,14 +411,13 @@ index e06c705..572a8fd 100644
 -version = "0.48.0"
 -features = ["Globalization"]
 diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml
-index b397dcf..2022a87 100644
+index 60ab32a..bf4109f 100644
 --- a/vendor/ignore/Cargo.toml
 +++ b/vendor/ignore/Cargo.toml
-@@ -64,6 +64,3 @@ version = "0.5.0"
- 
+@@ -77,5 +77,3 @@ version = "0.5.8"
  [features]
- simd-accel = ["globset/simd-accel"]
--
+ simd-accel = []
+ 
 -[target."cfg(windows)".dependencies.winapi-util]
 -version = "0.1.2"
 diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml
@@ -471,17 +490,6 @@ index 45f4a71..516644c 100644
 -[target."cfg(windows)".dependencies.openssl-sys]
 -version = "0.9.35"
 -optional = true
-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",
- ]
--
--[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
--version = "0.2"
 diff --git a/vendor/mio/Cargo.toml b/vendor/mio/Cargo.toml
 index 42e28d0..b689d7b 100644
 --- a/vendor/mio/Cargo.toml
@@ -519,10 +527,10 @@ index a059236..d36b44b 100644
 -
 -[target."cfg(target_os = \"windows\")".dependencies.schannel]
 -version = "0.1.17"
-diff --git a/vendor/nu-ansi-term/Cargo.toml b/vendor/nu-ansi-term/Cargo.toml
+diff --git a/vendor/nu-ansi-term-0.46.0/Cargo.toml b/vendor/nu-ansi-term-0.46.0/Cargo.toml
 index 209e055..aa40f02 100644
---- a/vendor/nu-ansi-term/Cargo.toml
-+++ b/vendor/nu-ansi-term/Cargo.toml
+--- a/vendor/nu-ansi-term-0.46.0/Cargo.toml
++++ b/vendor/nu-ansi-term-0.46.0/Cargo.toml
 @@ -45,13 +45,3 @@ version = "1.0.39"
  
  [features]
@@ -602,31 +610,11 @@ index 52a062f..e1f347b 100644
 -    "winerror",
 -    "winreg",
 -]
-diff --git a/vendor/parking_lot_core-0.8.6/Cargo.toml b/vendor/parking_lot_core-0.8.6/Cargo.toml
-index 6981516..9fb8bd2 100644
---- a/vendor/parking_lot_core-0.8.6/Cargo.toml
-+++ b/vendor/parking_lot_core-0.8.6/Cargo.toml
-@@ -60,15 +60,3 @@ version = "0.2.8"
- 
- [target."cfg(unix)".dependencies.libc]
- version = "0.2.95"
--
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = [
--    "winnt",
--    "ntstatus",
--    "minwindef",
--    "winerror",
--    "winbase",
--    "errhandlingapi",
--    "handleapi",
--]
 diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml
-index d76740d..7da23fc 100644
+index 83d9f23..dbe1534 100644
 --- a/vendor/parking_lot_core/Cargo.toml
 +++ b/vendor/parking_lot_core/Cargo.toml
-@@ -57,6 +57,3 @@ version = "0.3"
+@@ -61,6 +61,3 @@ version = "0.4"
  
  [target."cfg(unix)".dependencies.libc]
  version = "0.2.95"
@@ -645,7 +633,7 @@ index bca6039..c735e2f 100644
 -[target."cfg(windows)".dependencies.winreg]
 -version = "0.10"
 diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml
-index 78cdf49..37249c3 100644
+index f05faec..970c4a9 100644
 --- a/vendor/rustix/Cargo.toml
 +++ b/vendor/rustix/Cargo.toml
 @@ -252,20 +252,3 @@ package = "errno"
@@ -654,12 +642,12 @@ index 78cdf49..37249c3 100644
  optional = true
 -
 -[target."cfg(windows)".dependencies.libc_errno]
--version = "0.3.1"
+-version = "0.3.8"
 -default-features = false
 -package = "errno"
 -
 -[target."cfg(windows)".dependencies.windows-sys]
--version = "0.48.0"
+-version = "0.52.0"
 -features = [
 -    "Win32_Foundation",
 -    "Win32_Networking_WinSock",
@@ -701,14 +689,13 @@ index 2cb92d6..52e12d2 100644
 -features = ["Win32_Foundation"]
 -optional = true
 diff --git a/vendor/socket2/Cargo.toml b/vendor/socket2/Cargo.toml
-index 3f1578c..bdac898 100644
+index ec3bc6a..59068eb 100644
 --- a/vendor/socket2/Cargo.toml
 +++ b/vendor/socket2/Cargo.toml
-@@ -58,11 +58,3 @@ all = []
- 
+@@ -59,10 +59,3 @@ all = []
  [target."cfg(unix)".dependencies.libc]
- version = "0.2.139"
--
+ version = "0.2.149"
+ 
 -[target."cfg(windows)".dependencies.winapi]
 -version = "0.3.9"
 -features = [