summaryrefslogtreecommitdiffstats
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/c-2002_disable-net-tests.patch91
-rw-r--r--debian/patches/c-update-libgit2.patch37
-rw-r--r--debian/patches/d-0000-ignore-removed-submodules.patch38
-rw-r--r--debian/patches/d-0005-no-jemalloc.patch6
-rw-r--r--debian/patches/d-0010-cargo-remove-vendored-c-crates.patch2
-rw-r--r--debian/patches/d-0011-cargo-remove-nghttp2.patch2
-rw-r--r--debian/patches/d-0012-cargo-always-return-dev-channel.patch4
-rw-r--r--debian/patches/d-0020-remove-windows-dependencies.patch154
-rw-r--r--debian/patches/d-0021-vendor-remove-windows-dependencies.patch253
-rw-r--r--debian/patches/d-fix-rustix-outline.patch14
-rw-r--r--debian/patches/series2
-rw-r--r--debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch14
-rw-r--r--debian/patches/u-ignore-endian-big-diff.patch70
13 files changed, 273 insertions, 414 deletions
diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch
index a3f7d112d..76f158538 100644
--- a/debian/patches/c-2002_disable-net-tests.patch
+++ b/debian/patches/c-2002_disable-net-tests.patch
@@ -222,8 +222,8 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_implicitly_to_only_allowed_registry() {
let _registry = RegistryBuilder::new()
.http_api()
-@@ -921,7 +921,7 @@ You may press ctrl-c [..]
- );
+@@ -963,7 +963,7 @@ fn publish_failed_with_index_and_only_al
+ .run();
}
-#[cargo_test]
@@ -231,7 +231,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_fail_with_no_registry_specified() {
let p = project().build();
-@@ -955,7 +955,7 @@ The registry `crates-io` is not listed i
+@@ -997,7 +997,7 @@ The registry `crates-io` is not listed i
.run();
}
@@ -240,7 +240,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn block_publish_no_registry() {
let p = project()
.file(
-@@ -985,7 +985,7 @@ fn block_publish_no_registry() {
+@@ -1027,7 +1027,7 @@ fn block_publish_no_registry() {
}
// Explicitly setting `crates-io` in the publish list.
@@ -249,7 +249,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_crates_io_explicit() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1038,7 +1038,7 @@ You may press ctrl-c [..]
+@@ -1080,7 +1080,7 @@ You may press ctrl-c [..]
.run();
}
@@ -258,7 +258,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_select_features() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1089,7 +1089,7 @@ You may press ctrl-c [..]
+@@ -1131,7 +1131,7 @@ You may press ctrl-c [..]
.run();
}
@@ -267,7 +267,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_all_features() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1140,7 +1140,7 @@ You may press ctrl-c [..]
+@@ -1182,7 +1182,7 @@ You may press ctrl-c [..]
.run();
}
@@ -276,7 +276,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_no_default_features() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -1176,7 +1176,7 @@ fn publish_with_no_default_features() {
+@@ -1218,7 +1218,7 @@ fn publish_with_no_default_features() {
.run();
}
@@ -285,7 +285,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_patch() {
let registry = RegistryBuilder::new().http_api().http_index().build();
Package::new("bar", "1.0.0").publish();
-@@ -1282,7 +1282,7 @@ You may press ctrl-c [..]
+@@ -1324,7 +1324,7 @@ You may press ctrl-c [..]
);
}
@@ -294,7 +294,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_checks_for_token_before_verify() {
let registry = registry::RegistryBuilder::new()
.no_configure_token()
-@@ -1331,7 +1331,7 @@ fn publish_checks_for_token_before_verif
+@@ -1373,7 +1373,7 @@ fn publish_checks_for_token_before_verif
.run();
}
@@ -303,7 +303,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_bad_source() {
let p = project()
.file(
-@@ -1380,7 +1380,7 @@ include `--registry crates-io` to use cr
+@@ -1422,7 +1422,7 @@ include `--registry crates-io` to use cr
}
// A dependency with both `git` and `version`.
@@ -312,7 +312,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_git_with_version() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -1524,7 +1524,7 @@ You may press ctrl-c [..]
+@@ -1566,7 +1566,7 @@ You may press ctrl-c [..]
);
}
@@ -321,7 +321,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_dev_dep_no_version() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -1614,7 +1614,7 @@ repository = "foo"
+@@ -1656,7 +1656,7 @@ repository = "foo"
);
}
@@ -330,7 +330,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn credentials_ambiguous_filename() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -1670,7 +1670,7 @@ You may press ctrl-c [..]
+@@ -1712,7 +1712,7 @@ You may press ctrl-c [..]
// --index will not load registry.token to avoid possibly leaking
// crates.io token to another server.
@@ -339,7 +339,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn index_requires_token() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -1705,7 +1705,7 @@ fn index_requires_token() {
+@@ -1747,7 +1747,7 @@ fn index_requires_token() {
}
// publish with source replacement without --registry
@@ -348,7 +348,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn cratesio_source_replacement() {
registry::init();
let p = project()
-@@ -1734,7 +1734,7 @@ include `--registry dummy-registry` or `
+@@ -1776,7 +1776,7 @@ include `--registry dummy-registry` or `
.run();
}
@@ -357,7 +357,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_with_missing_readme() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -1782,7 +1782,7 @@ Caused by:
+@@ -1824,7 +1824,7 @@ Caused by:
}
// Registry returns an API error.
@@ -366,7 +366,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_error_json() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1830,7 +1830,7 @@ Caused by:
+@@ -1872,7 +1872,7 @@ Caused by:
}
// Registry returns an API error with a 200 status code.
@@ -375,7 +375,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_error_200() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1878,7 +1878,7 @@ Caused by:
+@@ -1920,7 +1920,7 @@ Caused by:
}
// Registry returns an error code without a JSON message.
@@ -384,7 +384,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_error_code() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1932,7 +1932,7 @@ Caused by:
+@@ -1975,7 +1975,7 @@ Caused by:
}
// Registry has a network error.
@@ -393,7 +393,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_curl_error() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -1982,7 +1982,7 @@ Caused by:
+@@ -2025,7 +2025,7 @@ Caused by:
}
// Registry returns an invalid response.
@@ -402,7 +402,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn api_other_error() {
let _registry = registry::RegistryBuilder::new()
.alternative()
-@@ -2032,7 +2032,7 @@ Caused by:
+@@ -2075,7 +2075,7 @@ Caused by:
.run();
}
@@ -411,7 +411,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -2084,7 +2084,7 @@ You may press ctrl-c [..]
+@@ -2127,7 +2127,7 @@ You may press ctrl-c [..]
validate_upload_li();
}
@@ -420,7 +420,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn with_duplicate_spec_in_members() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2136,7 +2136,7 @@ fn with_duplicate_spec_in_members() {
+@@ -2179,7 +2179,7 @@ fn with_duplicate_spec_in_members() {
.run();
}
@@ -429,7 +429,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_with_members_with_features_old() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -2187,7 +2187,7 @@ You may press ctrl-c [..]
+@@ -2230,7 +2230,7 @@ You may press ctrl-c [..]
validate_upload_li();
}
@@ -438,7 +438,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_virtual_workspace() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2223,7 +2223,7 @@ fn in_virtual_workspace() {
+@@ -2266,7 +2266,7 @@ fn in_virtual_workspace() {
.run();
}
@@ -447,7 +447,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_virtual_workspace_with_p() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -2281,7 +2281,7 @@ You may press ctrl-c [..]
+@@ -2324,7 +2324,7 @@ You may press ctrl-c [..]
.run();
}
@@ -456,7 +456,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_not_found() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2326,7 +2326,7 @@ error: package ID specification `li` did
+@@ -2369,7 +2369,7 @@ error: package ID specification `li` did
.run();
}
@@ -465,7 +465,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn in_package_workspace_found_multiple() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -2383,7 +2383,7 @@ error: the `-p` argument must be specifi
+@@ -2426,7 +2426,7 @@ error: the `-p` argument must be specifi
.run();
}
@@ -474,7 +474,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
// https://github.com/rust-lang/cargo/issues/10536
fn publish_path_dependency_without_workspace() {
// Use local registry for faster test times since no publish will occur
-@@ -2430,7 +2430,7 @@ error: package ID specification `bar` di
+@@ -2473,7 +2473,7 @@ error: package ID specification `bar` di
.run();
}
@@ -483,7 +483,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn http_api_not_noop() {
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -2491,7 +2491,7 @@ You may press ctrl-c [..]
+@@ -2534,7 +2534,7 @@ You may press ctrl-c [..]
p.cargo("build").run();
}
@@ -492,7 +492,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_first_publish() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2573,7 +2573,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2616,7 +2616,7 @@ You may press ctrl-c to skip waiting; th
/// A separate test is needed for package names with - or _ as they hit
/// the responder twice per cargo invocation. If that ever gets changed
/// this test will need to be changed accordingly.
@@ -501,7 +501,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_first_publish_underscore() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2669,7 +2669,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2712,7 +2712,7 @@ You may press ctrl-c to skip waiting; th
p.cargo("build").with_status(0).run();
}
@@ -510,7 +510,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn wait_for_subsequent_publish() {
// Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
-@@ -2761,7 +2761,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2804,7 +2804,7 @@ You may press ctrl-c to skip waiting; th
p.cargo("check").with_status(0).run();
}
@@ -523,16 +523,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
===================================================================
--- rust.orig/src/tools/cargo/tests/testsuite/credential_process.rs
+++ rust/src/tools/cargo/tests/testsuite/credential_process.rs
-@@ -7,7 +7,7 @@ fn toml_bin(proj: &Project, name: &str)
- proj.bin(name).display().to_string().replace('\\', "\\\\")
- }
-
--#[cargo_test]
-+#[allow(dead_code)]
- fn gated() {
- let _alternative = registry::RegistryBuilder::new()
- .alternative()
-@@ -120,7 +120,7 @@ fn get_token_test() -> (Project, TestReg
+@@ -63,7 +63,7 @@ fn get_token_test() -> (Project, TestReg
(p, server)
}
@@ -541,7 +532,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
fn publish() {
// Checks that credential-process is used for `cargo publish`.
let (p, _t) = get_token_test();
-@@ -143,7 +143,7 @@ You may press ctrl-c [..]
+@@ -85,7 +85,7 @@ You may press ctrl-c [..]
.run();
}
@@ -550,7 +541,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
fn basic_unsupported() {
// Non-action commands don't support login/logout.
let registry = registry::RegistryBuilder::new()
-@@ -181,7 +181,7 @@ Caused by:
+@@ -121,7 +121,7 @@ Caused by:
.run();
}
@@ -559,7 +550,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
fn login() {
let registry = registry::RegistryBuilder::new()
.no_configure_token()
-@@ -203,7 +203,7 @@ fn login() {
+@@ -142,7 +142,7 @@ fn login() {
.run();
}
@@ -568,7 +559,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
fn logout() {
let server = registry::RegistryBuilder::new()
.no_configure_token()
-@@ -223,7 +223,7 @@ fn logout() {
+@@ -161,7 +161,7 @@ fn logout() {
.run();
}
@@ -577,7 +568,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
fn yank() {
let (p, _t) = get_token_test();
-@@ -239,7 +239,7 @@ fn yank() {
+@@ -176,7 +176,7 @@ fn yank() {
.run();
}
@@ -586,7 +577,7 @@ Index: rust/src/tools/cargo/tests/testsuite/credential_process.rs
fn owner() {
let (p, _t) = get_token_test();
-@@ -255,7 +255,7 @@ fn owner() {
+@@ -191,7 +191,7 @@ fn owner() {
.run();
}
diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch
deleted file mode 100644
index c1d59a40a..000000000
--- a/debian/patches/c-update-libgit2.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: rust/src/tools/cargo/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/Cargo.toml
-+++ rust/src/tools/cargo/Cargo.toml
-@@ -37,8 +37,8 @@ curl-sys = "0.4.65"
- filetime = "0.2.21"
- flate2 = { version = "1.0.26", default-features = false, features = ["zlib"] }
- fwdansi = "1.1.0"
--git2 = "0.17.2"
--git2-curl = "0.18.0"
-+git2 = "0.18"
-+git2-curl = "0.19.0"
- gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
- gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] }
- glob = "0.3.1"
-@@ -56,7 +56,7 @@ jobserver = "0.1.26"
- lazy_static = "1.4.0"
- lazycell = "1.3.0"
- libc = "0.2.147"
--libgit2-sys = "0.15.2"
-+libgit2-sys = "0.16.1"
- libloading = "0.8.0"
- memchr = "2.5.0"
- miow = "0.6.0"
-Index: rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/crates/cargo-test-support/Cargo.toml
-+++ rust/src/tools/cargo/crates/cargo-test-support/Cargo.toml
-@@ -15,7 +15,7 @@ cargo-util = { path = "../cargo-util" }
- crates-io = { path = "../crates-io" }
- filetime = "0.2"
- flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
--git2 = "0.17.0"
-+git2 = "0.18.0"
- glob = "0.3"
- itertools = "0.10.0"
- lazy_static = "1.0"
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 3542cd9c5..2002ea30d 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -11,7 +11,7 @@ Subject: d-0000-ignore-removed-submodules
5 files changed, 24 insertions(+), 64 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
-index d2e84d5..a852385 100644
+index 9b11ae8..19a98f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,22 +19,15 @@ members = [
@@ -38,10 +38,10 @@ index d2e84d5..a852385 100644
"src/tools/lld-wrapper",
"src/tools/collect-license-metadata",
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index f44a05a..27da09c 100644
+index fac0cdf..6fa1e9e 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
-@@ -944,10 +944,6 @@ class RustBuild(object):
+@@ -962,10 +962,6 @@ class RustBuild(object):
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
args.extend("--verbose" for _ in range(self.verbose))
@@ -53,10 +53,10 @@ index f44a05a..27da09c 100644
args.append("--features")
args.append("build-metrics")
diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index b366619..8866581 100644
+index 46a62ee..216158c 100644
--- a/src/bootstrap/builder.rs
+++ b/src/bootstrap/builder.rs
-@@ -497,20 +497,20 @@ impl<'a> ShouldRun<'a> {
+@@ -499,20 +499,20 @@ impl<'a> ShouldRun<'a> {
static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new();
let init_submodules_paths = |src: &PathBuf| {
@@ -89,7 +89,7 @@ index b366619..8866581 100644
submodules_paths
};
-@@ -684,25 +684,14 @@ impl<'a> Builder<'a> {
+@@ -686,25 +686,14 @@ impl<'a> Builder<'a> {
tool::Linkchecker,
tool::CargoTest,
tool::Compiletest,
@@ -112,10 +112,10 @@ index b366619..8866581 100644
- llvm::Lld,
- llvm::CrtBeginEnd,
- tool::RustdocGUITest,
- tool::OptimizedDist
+ tool::OptimizedDist,
+ tool::CoverageDump,
),
- Kind::Check | Kind::Clippy | Kind::Fix => describe!(
-@@ -711,12 +700,7 @@ impl<'a> Builder<'a> {
+@@ -714,12 +703,7 @@ impl<'a> Builder<'a> {
check::Rustdoc,
check::CodegenBackend,
check::Clippy,
@@ -128,7 +128,7 @@ index b366619..8866581 100644
check::Bootstrap
),
Kind::Test => describe!(
-@@ -745,7 +729,6 @@ impl<'a> Builder<'a> {
+@@ -750,7 +734,6 @@ impl<'a> Builder<'a> {
test::TierCheck,
test::Cargotest,
test::Cargo,
@@ -136,7 +136,7 @@ index b366619..8866581 100644
test::ErrorIndex,
test::Distcheck,
test::RunMakeFullDeps,
-@@ -761,7 +744,6 @@ impl<'a> Builder<'a> {
+@@ -766,7 +749,6 @@ impl<'a> Builder<'a> {
test::EmbeddedBook,
test::EditionGuide,
test::Rustfmt,
@@ -144,7 +144,7 @@ index b366619..8866581 100644
test::Clippy,
test::RustDemangler,
test::CompiletestTest,
-@@ -798,7 +780,6 @@ impl<'a> Builder<'a> {
+@@ -803,7 +785,6 @@ impl<'a> Builder<'a> {
doc::CargoBook,
doc::Clippy,
doc::ClippyBook,
@@ -152,7 +152,7 @@ index b366619..8866581 100644
doc::EmbeddedBook,
doc::EditionGuide,
doc::StyleGuide,
-@@ -816,12 +797,9 @@ impl<'a> Builder<'a> {
+@@ -821,12 +802,9 @@ impl<'a> Builder<'a> {
dist::Analysis,
dist::Src,
dist::Cargo,
@@ -165,7 +165,7 @@ index b366619..8866581 100644
dist::LlvmTools,
dist::RustDev,
dist::Bootstrap,
-@@ -838,11 +816,9 @@ impl<'a> Builder<'a> {
+@@ -843,11 +821,9 @@ impl<'a> Builder<'a> {
install::Docs,
install::Std,
install::Cargo,
@@ -177,7 +177,7 @@ index b366619..8866581 100644
install::LlvmTools,
install::Src,
install::Rustc
-@@ -852,7 +828,6 @@ impl<'a> Builder<'a> {
+@@ -857,7 +833,6 @@ impl<'a> Builder<'a> {
run::BuildManifest,
run::BumpStage0,
run::ReplaceVersionPlaceholder,
@@ -185,7 +185,7 @@ index b366619..8866581 100644
run::CollectLicenseMetadata,
run::GenerateCopyright,
run::GenerateWindowsSys,
-@@ -1990,10 +1965,7 @@ impl<'a> Builder<'a> {
+@@ -1998,10 +1973,7 @@ impl<'a> Builder<'a> {
}
}
@@ -198,10 +198,10 @@ index b366619..8866581 100644
}
diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index d0d62db..3c4c4e3 100644
+index ba030f0..ba2e669 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
-@@ -2143,17 +2143,7 @@ impl Step for RustcGuide {
+@@ -2167,17 +2167,7 @@ impl Step for RustcGuide {
}
fn run(self, builder: &Builder<'_>) {
@@ -221,7 +221,7 @@ index d0d62db..3c4c4e3 100644
}
diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
-index f6a50bf..bd38d4f 100644
+index cab88fc..5bac437 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-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch
index a947d676b..ea3975d6f 100644
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/d-0005-no-jemalloc.patch
@@ -8,12 +8,12 @@ Subject: d-0005-no-jemalloc
2 files changed, 8 deletions(-)
diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
-index 41003ad..0578f7b 100644
+index dcb165f..e211d6f 100644
--- a/compiler/rustc/Cargo.toml
+++ b/compiler/rustc/Cargo.toml
-@@ -14,13 +14,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
- # crate is intended to be used by stable MIR consumers, which are not in-tree
+@@ -15,13 +15,7 @@ rustc_codegen_ssa = { path = "../rustc_codegen_ssa" }
rustc_smir = { path = "../rustc_smir" }
+ stable_mir = { path = "../stable_mir" }
-[dependencies.jemalloc-sys]
-version = "0.5.0"
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 1e8c91ca6..cc0ab7881 100644
--- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
+++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
@@ -8,7 +8,7 @@ Last-Update: 2023-05-17
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
-index 0e189a6..4071e8c 100644
+index 4403044..23c5cc7 100644
--- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml
@@ -217,7 +217,5 @@ test = false
diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch
index ef2fe174f..e5d78db0c 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 174d6eb..ffa79ac 100644
+index 9149121..b36d525 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 e30e2a40d..86e67ed75 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 9b99d5a..980f94a 100644
+index 5faa208..eefbf78 100644
--- a/src/tools/cargo/src/cargo/core/features.rs
+++ b/src/tools/cargo/src/cargo/core/features.rs
-@@ -1215,9 +1215,8 @@ pub fn channel() -> String {
+@@ -1212,9 +1212,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 3bb0bdcb8..cc3514750 100644
--- a/debian/patches/d-0020-remove-windows-dependencies.patch
+++ b/debian/patches/d-0020-remove-windows-dependencies.patch
@@ -4,23 +4,24 @@ Subject: d-0020-remove-windows-dependencies
===================================================================
---
- compiler/rustc_codegen_ssa/Cargo.toml | 4 ---
- compiler/rustc_data_structures/Cargo.toml | 10 ------
- compiler/rustc_driver_impl/Cargo.toml | 6 ----
- compiler/rustc_errors/Cargo.toml | 8 -----
- compiler/rustc_session/Cargo.toml | 7 ----
- library/backtrace/Cargo.toml | 13 -------
- src/bootstrap/Cargo.toml | 15 --------
- src/tools/cargo/Cargo.toml | 20 ++---------
- .../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 --
- .../cargo/credential/cargo-credential/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 ---
- 16 files changed, 22 insertions(+), 138 deletions(-)
+ compiler/rustc_codegen_ssa/Cargo.toml | 4 ----
+ compiler/rustc_data_structures/Cargo.toml | 10 ----------
+ compiler/rustc_driver_impl/Cargo.toml | 6 ------
+ compiler/rustc_errors/Cargo.toml | 8 --------
+ compiler/rustc_session/Cargo.toml | 7 -------
+ library/backtrace/Cargo.toml | 13 -------------
+ src/bootstrap/Cargo.toml | 15 ---------------
+ src/tools/cargo/Cargo.toml | 21 +++------------------
+ .../cargo/crates/cargo-test-support/Cargo.toml | 3 ---
+ src/tools/cargo/crates/cargo-util/Cargo.toml | 7 -------
+ src/tools/cargo/crates/home/Cargo.toml | 3 ---
+ .../cargo/credential/cargo-credential/Cargo.toml | 3 ---
+ src/tools/cargo/src/cargo/util/auth/mod.rs | 2 --
+ src/tools/compiletest/Cargo.toml | 10 ----------
+ src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 ---
+ .../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ------
+ src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 ----
+ 17 files changed, 3 insertions(+), 122 deletions(-)
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index 34d0e2d..2cb22f0 100644
@@ -106,10 +107,10 @@ index e26d25d..fe343f8 100644
- "Win32_System_LibraryLoader",
-]
diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml
-index cff2c9e..ad053f0 100644
+index 6714b3b..71d56b4 100644
--- a/library/backtrace/Cargo.toml
+++ b/library/backtrace/Cargo.toml
-@@ -45,9 +45,6 @@ version = "0.31.1"
+@@ -47,9 +47,6 @@ version = "0.32.0"
default-features = false
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
@@ -119,7 +120,7 @@ index cff2c9e..ad053f0 100644
[build-dependencies]
# Only needed for Android, but cannot be target dependent
# https://github.com/rust-lang/cargo/issues/4932
-@@ -85,16 +82,6 @@ libbacktrace = []
+@@ -87,16 +84,6 @@ libbacktrace = []
libunwind = []
unix-backtrace = []
verify-winapi = [
@@ -137,7 +138,7 @@ index cff2c9e..ad053f0 100644
[[example]]
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
-index 74b9a23..e65e3c2 100644
+index 9bf2694..9fc6f66 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -62,21 +62,6 @@ semver = "1.0.17"
@@ -160,10 +161,10 @@ index 74b9a23..e65e3c2 100644
-]
-
[dev-dependencies]
- pretty_assertions = "1.2"
+ pretty_assertions = "1.4"
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
-index 4071e8c..1f8164f 100644
+index 23c5cc7..91ecfd0 100644
--- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml
@@ -2,7 +2,9 @@
@@ -177,39 +178,36 @@ index 4071e8c..1f8164f 100644
"benches/benchsuite",
"benches/capture",
]
-@@ -21,8 +23,6 @@ bytesize = "1.2"
+@@ -24,8 +26,6 @@ bytesize = "1.3"
cargo = { path = "" }
- cargo-credential = { version = "0.3.0", path = "credential/cargo-credential" }
+ cargo-credential = { version = "0.4.0", path = "credential/cargo-credential" }
cargo-credential-libsecret = { version = "0.3.1", path = "credential/cargo-credential-libsecret" }
-cargo-credential-wincred = { version = "0.3.0", path = "credential/cargo-credential-wincred" }
-cargo-credential-macos-keychain = { version = "0.3.0", path = "credential/cargo-credential-macos-keychain" }
cargo-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" }
-@@ -100,7 +100,6 @@ unicode-xid = "0.2.4"
- url = "2.4.0"
+@@ -101,7 +101,6 @@ unicode-xid = "0.2.4"
+ url = "2.4.1"
varisat = "0.2.2"
walkdir = "2.3.3"
-windows-sys = "0.48"
[package]
name = "cargo"
-@@ -125,8 +124,6 @@ bytesize.workspace = true
+@@ -128,8 +127,6 @@ bytesize.workspace = true
cargo-platform.workspace = true
cargo-credential.workspace = true
cargo-credential-libsecret.workspace = true
-cargo-credential-macos-keychain.workspace = true
-cargo-credential-wincred.workspace = true
cargo-util.workspace = true
+ color-print.workspace = true
clap = { workspace = true, features = ["wrap_help"] }
- crates-io.workspace = true
-@@ -186,21 +183,6 @@ walkdir.workspace = true
+@@ -189,18 +186,6 @@ walkdir.workspace = true
[target.'cfg(not(windows))'.dependencies]
openssl = { workspace = true, optional = true }
--[target.'cfg(windows)'.dependencies]
--fwdansi.workspace = true
--
-[target.'cfg(windows)'.dependencies.windows-sys]
-workspace = true
-features = [
@@ -226,59 +224,21 @@ index 4071e8c..1f8164f 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 085041a..fa0e603 100644
+index fc32e1c..ce5d708 100644
--- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
-@@ -9,25 +9,22 @@ publish = false
- doctest = false
-
- [dependencies]
--anyhow.workspace = true
--cargo-test-macro.workspace = true
--cargo-util.workspace = true
--crates-io.workspace = true
--filetime.workspace = true
--flate2.workspace = true
--git2.workspace = true
--glob.workspace = true
--itertools.workspace = true
--lazy_static.workspace = true
--pasetors.workspace = true
--serde = { workspace = true, features = ["derive"] }
--serde_json.workspace = true
--snapbox.workspace = true
--tar.workspace = true
--termcolor.workspace = true
--time.workspace = true
--toml.workspace = true
--url.workspace = true
+@@ -29,6 +29,3 @@ tar.workspace = true
+ time.workspace = true
+ toml.workspace = true
+ url.workspace = true
-
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_Storage_FileSystem"] }
-+anyhow = "1.0.34"
-+cargo-test-macro = { path = "../cargo-test-macro" }
-+cargo-util = { path = "../cargo-util" }
-+crates-io = { path = "../crates-io" }
-+filetime = "0.2"
-+flate2 = { version = "1.0", default-features = false, features = ["zlib"] }
-+git2 = "0.17.0"
-+glob = "0.3"
-+itertools = "0.10.0"
-+lazy_static = "1.0"
-+pasetors = { version = "0.6.4", features = ["v3", "paserk", "std", "serde"] }
-+serde = { version = "1.0.123", features = ["derive"] }
-+serde_json = "1.0"
-+snapbox = { version = "0.4.0", features = ["diff", "path"] }
-+tar = { version = "0.4.38", default-features = false }
-+termcolor = "1.1.2"
-+time = { version = "0.3", features = ["parsing", "formatting"]}
-+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 99a5942..39eb404 100644
+index cba00f9..fb52b6e 100644
--- a/src/tools/cargo/crates/cargo-util/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
-@@ -19,10 +19,3 @@ shell-escape.workspace = true
+@@ -20,10 +20,3 @@ shell-escape.workspace = true
tempfile.workspace = true
tracing.workspace = true
walkdir.workspace = true
@@ -301,10 +261,10 @@ index 03bd555..32fdf26 100644
-[target.'cfg(windows)'.dependencies]
-windows-sys = { workspace = true, features = ["Win32_Foundation", "Win32_UI_Shell"] }
diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml
-index 8cd1348..84b30cf 100644
+index c8db996..96aa498 100644
--- a/src/tools/cargo/credential/cargo-credential/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml
-@@ -14,8 +14,5 @@ serde_json.workspace = true
+@@ -15,8 +15,5 @@ serde_json.workspace = true
thiserror.workspace = true
time.workspace = true
@@ -313,11 +273,24 @@ index 8cd1348..84b30cf 100644
-
[dev-dependencies]
snapbox = { workspace = true, features = ["examples"] }
+diff --git a/src/tools/cargo/src/cargo/util/auth/mod.rs b/src/tools/cargo/src/cargo/util/auth/mod.rs
+index ea82dce..df181db 100644
+--- a/src/tools/cargo/src/cargo/util/auth/mod.rs
++++ b/src/tools/cargo/src/cargo/util/auth/mod.rs
+@@ -529,8 +529,6 @@ fn credential_action(
+ }
+ "cargo:paseto" => bail!("cargo:paseto requires -Zasymmetric-token"),
+ "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}),
+- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}),
+- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}),
+ "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}),
+ process => Box::new(CredentialProcessCredential::new(process)),
+ };
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
-index ff1d5ce..61f7be4 100644
+index bb1fa6e..2735e1e 100644
--- a/src/tools/compiletest/Cargo.toml
+++ b/src/tools/compiletest/Cargo.toml
-@@ -27,13 +27,3 @@ anyhow = "1"
+@@ -28,13 +28,3 @@ home = "0.5.5"
[target.'cfg(unix)'.dependencies]
libc = "0.2"
@@ -346,10 +319,10 @@ index fd98d85..8c1d1379 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 5bfac7e..04b23a1 100644
+index 7410f0a..d25b922 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-@@ -72,12 +72,6 @@ toolchain.workspace = true
+@@ -71,12 +71,6 @@ toolchain.workspace = true
vfs-notify.workspace = true
vfs.workspace = true
@@ -377,16 +350,3 @@ index 536f000..6ed37f5 100644
[features]
# Uncomment to enable for the whole crate graph
# default = [ "backtrace" ]
-Index: rust/src/tools/cargo/src/cargo/util/auth/mod.rs
-===================================================================
---- rust.orig/src/tools/cargo/src/cargo/util/auth/mod.rs
-+++ rust/src/tools/cargo/src/cargo/util/auth/mod.rs
-@@ -456,8 +456,6 @@ fn credential_action(
- "cargo:token" => Box::new(TokenCredential::new(config)),
- "cargo:paseto" => Box::new(PasetoCredential::new(config)),
- "cargo:token-from-stdout" => Box::new(BasicProcessCredential {}),
-- "cargo:wincred" => Box::new(cargo_credential_wincred::WindowsCredential {}),
-- "cargo:macos-keychain" => Box::new(cargo_credential_macos_keychain::MacKeychain {}),
- "cargo:libsecret" => Box::new(cargo_credential_libsecret::LibSecretCredential {}),
- process => Box::new(CredentialProcessCredential::new(process)),
- };
diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
index d925753da..80cb21a53 100644
--- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
+++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
@@ -7,64 +7,59 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- vendor/android-tzdata/Cargo.toml | 1 +
- vendor/anstream/Cargo.toml | 6 ----
- vendor/anstyle-query/Cargo.toml | 7 -----
- vendor/atty/Cargo.toml | 3 --
- vendor/backtrace/Cargo.toml | 13 ---------
- vendor/chrono/Cargo.toml | 12 --------
- vendor/colored/Cargo.toml | 4 ---
- vendor/curl-sys-0.4.63+curl-8.1.2/Cargo.toml | 10 -------
- vendor/curl-sys/Cargo.toml | 10 -------
- vendor/curl/Cargo.toml | 10 -------
- vendor/dirs-sys-next/Cargo.toml | 3 --
- vendor/dirs-sys/Cargo.toml | 3 --
- vendor/errno/Cargo.toml | 6 ----
- vendor/fd-lock/Cargo.toml | 8 ------
- vendor/filetime/Cargo.toml | 7 -----
- vendor/gix-sec/Cargo.toml | 12 --------
- vendor/home/Cargo.toml | 7 -----
- vendor/iana-time-zone/Cargo.toml | 4 ---
- vendor/ignore/Cargo.toml | 3 --
- vendor/io-close/Cargo.toml | 3 --
- vendor/io-lifetimes/Cargo.toml | 13 ---------
- vendor/is-terminal/Cargo.toml | 11 --------
- vendor/libloading-0.7.4/Cargo.toml | 6 ----
- vendor/libloading/Cargo.toml | 8 ------
- vendor/libssh2-sys/Cargo.toml | 8 ------
- vendor/libz-sys/Cargo.toml | 3 --
- vendor/mio/Cargo.toml | 11 --------
- vendor/native-tls/Cargo.toml | 3 --
- vendor/normpath/Cargo.toml | 10 -------
- vendor/nu-ansi-term/Cargo.toml | 10 -------
- vendor/opener-0.5.2/Cargo.toml | 4 ---
- vendor/opener/Cargo.toml | 9 ------
- vendor/openssl-sys/Cargo.toml | 3 --
- vendor/os_info/Cargo.toml | 15 ----------
- vendor/parking_lot_core-0.8.6/Cargo.toml | 12 --------
- vendor/parking_lot_core/Cargo.toml | 3 --
- vendor/pretty_assertions-1.3.0/Cargo.toml | 6 ----
- vendor/reqwest/Cargo.toml | 3 --
- vendor/rustix-0.37.20/Cargo.toml | 16 -----------
- vendor/rustix-0.37.22/Cargo.toml | 16 -----------
- vendor/rustix/Cargo.toml | 17 ------------
- vendor/same-file/Cargo.toml | 2 --
- vendor/snapbox/Cargo.toml | 6 ----
- vendor/socket2/Cargo.toml | 8 ------
- vendor/stacker/Cargo.toml | 10 -------
- vendor/sysinfo-0.26.7/Cargo.toml | 38 --------------------------
- vendor/sysinfo/Cargo.toml | 41 ----------------------------
- vendor/tempfile-3.6.0/Cargo.toml | 7 -----
- vendor/tempfile/Cargo.toml | 7 -----
- vendor/term/Cargo.toml | 6 ----
- vendor/termcolor/Cargo.toml | 3 --
- vendor/terminal_size/Cargo.toml | 7 -----
- vendor/termize/Cargo.toml | 3 --
- vendor/tokio/Cargo.toml | 21 --------------
- vendor/uuid/Cargo.toml | 4 ---
- vendor/walkdir/Cargo.toml | 3 --
- vendor/yansi-term/Cargo.toml | 3 --
- 57 files changed, 1 insertion(+), 487 deletions(-)
+ 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-next/Cargo.toml | 3 ---
+ vendor/dirs-sys/Cargo.toml | 3 ---
+ vendor/errno/Cargo.toml | 6 -----
+ vendor/fd-lock/Cargo.toml | 8 -------
+ vendor/filetime/Cargo.toml | 7 ------
+ vendor/gix-sec/Cargo.toml | 12 ----------
+ vendor/home/Cargo.toml | 7 ------
+ vendor/iana-time-zone/Cargo.toml | 4 ----
+ vendor/ignore/Cargo.toml | 3 ---
+ vendor/io-lifetimes/Cargo.toml | 13 ----------
+ vendor/is-terminal/Cargo.toml | 11 ---------
+ vendor/libloading-0.7.4/Cargo.toml | 6 -----
+ vendor/libloading/Cargo.toml | 8 -------
+ vendor/libssh2-sys/Cargo.toml | 8 -------
+ vendor/libz-sys/Cargo.toml | 3 ---
+ vendor/mio/Cargo.toml | 11 ---------
+ vendor/native-tls/Cargo.toml | 3 ---
+ vendor/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/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/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 ---
+ 56 files changed, 1 insertion(+), 489 deletions(-)
Index: rust/vendor/android-tzdata/Cargo.toml
===================================================================
@@ -75,20 +70,32 @@ Index: rust/vendor/android-tzdata/Cargo.toml
[dev-dependencies.zip]
version = "0.6.4"
+repository = "https://github.com/rust-cli/concolor"
+Index: rust/vendor/ansi_term/Cargo.toml
+===================================================================
+--- rust.orig/vendor/ansi_term/Cargo.toml
++++ rust/vendor/ansi_term/Cargo.toml
+@@ -38,6 +38,3 @@ version = "1.0.39"
+
+ [features]
+ derive_serde_style = ["serde"]
+-[target."cfg(target_os=\"windows\")".dependencies.winapi]
+-version = "0.3.4"
+-features = ["consoleapi", "errhandlingapi", "fileapi", "handleapi", "processenv"]
Index: rust/vendor/anstream/Cargo.toml
===================================================================
--- rust.orig/vendor/anstream/Cargo.toml
+++ rust/vendor/anstream/Cargo.toml
-@@ -136,10 +136,4 @@ auto = [
+@@ -131,11 +131,4 @@ auto = [
]
default = [
"auto",
- "wincon",
]
+-test = []
-wincon = ["dep:anstyle-wincon"]
-
-[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "1.0.1"
+-version = "3.0.1"
-optional = true
Index: rust/vendor/anstyle-query/Cargo.toml
===================================================================
@@ -122,7 +129,7 @@ Index: rust/vendor/backtrace/Cargo.toml
===================================================================
--- rust.orig/vendor/backtrace/Cargo.toml
+++ rust/vendor/backtrace/Cargo.toml
-@@ -127,18 +127,5 @@ serialize-serde = ["serde"]
+@@ -104,16 +104,6 @@ serialize-serde = ["serde"]
std = []
unix-backtrace = []
verify-winapi = [
@@ -138,6 +145,12 @@ Index: rust/vendor/backtrace/Cargo.toml
- "winapi/winnt",
]
+ [target."cfg(not(all(windows, target_env = \"msvc\", not(target_vendor = \"uwp\"))))".dependencies.addr2line]
+@@ -139,7 +129,3 @@ features = [
+ "archive",
+ ]
+ default-features = false
+-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
-optional = true
@@ -172,31 +185,50 @@ Index: rust/vendor/colored/Cargo.toml
===================================================================
--- rust.orig/vendor/colored/Cargo.toml
+++ rust/vendor/colored/Cargo.toml
-@@ -33,7 +33,3 @@ version = "=1.0.0-beta.3"
+@@ -42,10 +42,3 @@ version = "=1.0.0-beta.3"
[features]
no-color = []
--[target."cfg(windows)".dependencies.winapi]
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48"
+-features = [
+- "Win32_Foundation",
+- "Win32_System_Console",
+-]
+Index: rust/vendor/console/Cargo.toml
+===================================================================
+--- rust.orig/vendor/console/Cargo.toml
++++ rust/vendor/console/Cargo.toml
+@@ -59,14 +59,3 @@ default = [
+ ]
+ windows-console-colors = ["ansi-parsing"]
+
+-[target."cfg(windows)".dependencies.encode_unicode]
-version = "0.3"
--features = ["consoleapi", "processenv", "winbase"]
--default-features = false
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.45.0"
+-features = [
+- "Win32_Foundation",
+- "Win32_System_Console",
+- "Win32_Storage_FileSystem",
+- "Win32_UI_Input_KeyboardAndMouse",
+-]
Index: rust/vendor/curl-sys/Cargo.toml
===================================================================
--- rust.orig/vendor/curl-sys/Cargo.toml
+++ rust/vendor/curl-sys/Cargo.toml
-@@ -73,16 +73,6 @@ zlib-ng-compat = [
+@@ -73,13 +73,6 @@ zlib-ng-compat = [
version = "0.9.64"
optional = true
-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
-version = "0.2"
-
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = [
-- "winsock2",
-- "ws2def",
--]
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48"
+-features = ["Win32_Networking_WinSock"]
-
[badges.appveyor]
repository = "alexcrichton/curl-rust"
@@ -280,7 +312,7 @@ Index: rust/vendor/filetime/Cargo.toml
===================================================================
--- rust.orig/vendor/filetime/Cargo.toml
+++ rust/vendor/filetime/Cargo.toml
-@@ -38,10 +38,3 @@ version = "0.2.9"
+@@ -38,10 +38,3 @@ version = "0.3.5"
[target."cfg(unix)".dependencies.libc]
version = "0.2.27"
@@ -300,7 +332,7 @@ Index: rust/vendor/gix-sec/Cargo.toml
version = "0.2.123"
-[target."cfg(windows)".dependencies.gix-path]
--version = "^0.8.1"
+-version = "^0.10.0"
-
-[target."cfg(windows)".dependencies.windows]
-version = "0.48"
@@ -349,17 +381,6 @@ Index: rust/vendor/ignore/Cargo.toml
-
-[target."cfg(windows)".dependencies.winapi-util]
-version = "0.1.2"
-Index: rust/vendor/io-close/Cargo.toml
-===================================================================
---- rust.orig/vendor/io-close/Cargo.toml
-+++ rust/vendor/io-close/Cargo.toml
-@@ -28,6 +28,3 @@ optional = true
- version = "3.1.0"
- [target."cfg(unix)".dependencies.libc]
- version = "0.2.80"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--features = ["handleapi", "std", "winsock2"]
Index: rust/vendor/io-lifetimes/Cargo.toml
===================================================================
--- rust.orig/vendor/io-lifetimes/Cargo.toml
@@ -378,7 +399,7 @@ Index: rust/vendor/io-lifetimes/Cargo.toml
optional = true
-
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.48.0"
+-version = "0.45.0"
-features = [
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
@@ -566,17 +587,6 @@ Index: rust/vendor/opener/Cargo.toml
[badges.appveyor]
branch = "master"
repository = "Seeker14491/opener"
-Index: rust/vendor/openssl-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/openssl-sys/Cargo.toml
-+++ rust/vendor/openssl-sys/Cargo.toml
-@@ -56,6 +56,3 @@ version = "0.3.9"
- [features]
- unstable_boringssl = ["bssl-sys"]
- vendored = ["openssl-src"]
--
--[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
--version = "0.2.8"
Index: rust/vendor/os_info/Cargo.toml
===================================================================
--- rust.orig/vendor/os_info/Cargo.toml
@@ -642,21 +652,17 @@ Index: rust/vendor/reqwest/Cargo.toml
-
-[target."cfg(windows)".dependencies.winreg]
-version = "0.10"
-Index: rust/vendor/rustix-0.37.22/Cargo.toml
+Index: rust/vendor/rustix-0.37.6/Cargo.toml
===================================================================
---- rust.orig/vendor/rustix-0.37.22/Cargo.toml
-+++ rust/vendor/rustix-0.37.22/Cargo.toml
-@@ -239,19 +239,3 @@ package = "errno"
+--- rust.orig/vendor/rustix-0.37.6/Cargo.toml
++++ rust/vendor/rustix-0.37.6/Cargo.toml
+@@ -232,15 +232,3 @@ package = "errno"
+ [target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell]
version = "1.5.2"
optional = true
-
--[target."cfg(windows)".dependencies.libc_errno]
--version = "0.3.1"
--default-features = false
--package = "errno"
-
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.48.0"
+-version = "0.45.0"
-features = [
- "Win32_Foundation",
- "Win32_Networking_WinSock",
@@ -665,12 +671,12 @@ Index: rust/vendor/rustix-0.37.22/Cargo.toml
-]
-
-[target."cfg(windows)".dev-dependencies.ctor]
--version = "0.2.0"
+-version = "0.1.21"
Index: rust/vendor/rustix/Cargo.toml
===================================================================
--- rust.orig/vendor/rustix/Cargo.toml
+++ rust/vendor/rustix/Cargo.toml
-@@ -238,20 +238,3 @@ package = "errno"
+@@ -249,20 +249,3 @@ package = "errno"
[target."cfg(any(target_os = \"android\", target_os = \"linux\"))".dependencies.once_cell]
version = "1.5.2"
optional = true
@@ -719,7 +725,7 @@ Index: rust/vendor/snapbox/Cargo.toml
optional = true
-
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
+-version = "0.48.0"
-features = ["Win32_Foundation"]
-optional = true
Index: rust/vendor/socket2/Cargo.toml
@@ -900,7 +906,7 @@ Index: rust/vendor/terminal_size/Cargo.toml
+++ rust/vendor/terminal_size/Cargo.toml
@@ -30,10 +30,3 @@ repository = "https://github.com/eminenc
[target."cfg(not(windows))".dependencies.rustix]
- version = "0.37.0"
+ version = "0.38.0"
features = ["termios"]
-
-[target."cfg(windows)".dependencies.windows-sys]
@@ -922,6 +928,31 @@ Index: rust/vendor/termize/Cargo.toml
-features = ["handleapi", "processenv", "wincon", "winbase"]
[badges.cirrus-ci]
repository = "JohnTitor/termize"
+Index: rust/vendor/tokio-native-tls/Cargo.toml
+===================================================================
+--- rust.orig/vendor/tokio-native-tls/Cargo.toml
++++ rust/vendor/tokio-native-tls/Cargo.toml
+@@ -76,20 +76,3 @@ version = "0.10"
+
+ [target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dev-dependencies.security-framework]
+ version = "0.2"
+-
+-[target."cfg(windows)".dev-dependencies.schannel]
+-version = "0.1"
+-
+-[target."cfg(windows)".dev-dependencies.winapi]
+-version = "0.3"
+-features = [
+- "lmcons",
+- "basetsd",
+- "minwinbase",
+- "minwindef",
+- "ntdef",
+- "sysinfoapi",
+- "timezoneapi",
+- "wincrypt",
+- "winerror",
+-]
Index: rust/vendor/tokio/Cargo.toml
===================================================================
--- rust.orig/vendor/tokio/Cargo.toml
diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch
index 059a52078..4ac594d0d 100644
--- a/debian/patches/d-fix-rustix-outline.patch
+++ b/debian/patches/d-fix-rustix-outline.patch
@@ -3,16 +3,16 @@ Always enable cc even if the feature is not enabled.
Some Debian architectures need outline asm, and Debian does not ship pre-built
outline asm.
-Index: rust/vendor/rustix-0.37.22/build.rs
+Index: rust/vendor/rustix-0.37.6/build.rs
===================================================================
---- rust.orig/vendor/rustix-0.37.22/build.rs
-+++ rust/vendor/rustix-0.37.22/build.rs
+--- rust.orig/vendor/rustix-0.37.6/build.rs
++++ rust/vendor/rustix-0.37.6/build.rs
@@ -1,4 +1,3 @@
-#[cfg(feature = "cc")]
use cc::Build;
use std::env::var;
use std::io::Write;
-@@ -169,16 +168,16 @@ fn link_in_librustix_outline(arch: &str,
+@@ -158,16 +157,16 @@ fn link_in_librustix_outline(arch: &str,
println!("cargo:rerun-if-changed={}", to);
// If "cc" is not enabled, use a pre-built library.
@@ -32,10 +32,10 @@ Index: rust/vendor/rustix-0.37.22/build.rs
{
let out_dir = var("OUT_DIR").unwrap();
// Add `-gdwarf-3` so that we always get the same output, regardless of
-Index: rust/vendor/rustix-0.37.22/Cargo.toml
+Index: rust/vendor/rustix-0.37.6/Cargo.toml
===================================================================
---- rust.orig/vendor/rustix-0.37.22/Cargo.toml
-+++ rust/vendor/rustix-0.37.22/Cargo.toml
+--- rust.orig/vendor/rustix-0.37.6/Cargo.toml
++++ rust/vendor/rustix-0.37.6/Cargo.toml
@@ -127,7 +127,6 @@ version = "3.4.0"
[build-dependencies.cc]
diff --git a/debian/patches/series b/debian/patches/series
index 0c5160fa2..ca50b1c7f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,6 @@ c-0003-tests-add-missing-cross-disabled-checks.patch
# pending, or forwarded
u-reproducible-build.patch
-u-ignore-endian-big-diff.patch
u-fix-get-toml-when-test.patch
u-disable-fp-precision-test-on-i386.patch
u-riscv-disable-unpacked-split-debuginfo.patch
@@ -71,4 +70,3 @@ ubuntu-disable-ppc64el-asm-tests.patch
ubuntu-ignore-arm-doctest.patch
d-0020-remove-windows-dependencies.patch
d-0021-vendor-remove-windows-dependencies.patch
-c-update-libgit2.patch
diff --git a/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
index b49347990..f3a3b52c9 100644
--- a/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
+++ b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
@@ -12,20 +12,6 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
tests/ui/issues/issue-21763.stderr | 3 ---
4 files changed, 20 insertions(+), 3 deletions(-)
-Index: rust/tests/ui/issues/issue-21763.stderr
-===================================================================
---- rust.orig/tests/ui/issues/issue-21763.stderr
-+++ rust/tests/ui/issues/issue-21763.stderr
-@@ -9,9 +9,6 @@ LL | foo::<HashMap<Rc<()>, Rc<()>>>(
- = note: required for `hashbrown::raw::RawTable<(Rc<()>, Rc<()>)>` to implement `Send`
- note: required because it appears within the type `HashMap<Rc<()>, Rc<()>, RandomState>`
- --> $HASHBROWN_SRC_LOCATION
-- |
--LL | pub struct HashMap<K, V, S = DefaultHashBuilder, A: Allocator + Clone = Global> {
-- | ^^^^^^^
- note: required because it appears within the type `HashMap<Rc<()>, Rc<()>>`
- --> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
- note: required by a bound in `foo`
Index: rust/tests/ui/issues/issue-21763.rs
===================================================================
--- rust.orig/tests/ui/issues/issue-21763.rs
diff --git a/debian/patches/u-ignore-endian-big-diff.patch b/debian/patches/u-ignore-endian-big-diff.patch
deleted file mode 100644
index faa270173..000000000
--- a/debian/patches/u-ignore-endian-big-diff.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:37 +0200
-Subject: u-ignore-endian-big-diff
-
-Bug: https://github.com/rust-lang/rust/issues/89577
-
-===================================================================
----
- src/test/ui/consts/const-eval/ub-enum.rs | 1 +
- src/test/ui/consts/const-eval/ub-int-array.rs | 1 +
- src/test/ui/consts/const-eval/ub-nonnull.rs | 1 +
- src/test/ui/consts/const-eval/ub-ref-ptr.rs | 1 +
- src/test/ui/consts/const-eval/ub-uninhabit.rs | 1 +
- src/test/ui/consts/const-eval/ub-wide-ptr.rs | 1 +
- 6 files changed, 6 insertions(+)
-
-Index: rust/tests/ui/consts/const-eval/ub-enum.rs
-===================================================================
---- rust.orig/tests/ui/consts/const-eval/ub-enum.rs
-+++ rust/tests/ui/consts/const-eval/ub-enum.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // stderr-per-bitwidth
- // Strip out raw byte dumps to make comparison platform-independent:
- // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-Index: rust/tests/ui/consts/const-eval/ub-int-array.rs
-===================================================================
---- rust.orig/tests/ui/consts/const-eval/ub-int-array.rs
-+++ rust/tests/ui/consts/const-eval/ub-int-array.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // stderr-per-bitwidth
- //! Test the "array of int" fast path in validity checking, and in particular whether it
- //! points at the right array element.
-Index: rust/tests/ui/consts/const-eval/ub-nonnull.rs
-===================================================================
---- rust.orig/tests/ui/consts/const-eval/ub-nonnull.rs
-+++ rust/tests/ui/consts/const-eval/ub-nonnull.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // Strip out raw byte dumps to make comparison platform-independent:
- // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
- // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
-Index: rust/tests/ui/consts/const-eval/ub-ref-ptr.rs
-===================================================================
---- rust.orig/tests/ui/consts/const-eval/ub-ref-ptr.rs
-+++ rust/tests/ui/consts/const-eval/ub-ref-ptr.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // ignore-tidy-linelength
- // Strip out raw byte dumps to make comparison platform-independent:
- // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
-Index: rust/tests/ui/consts/const-eval/ub-uninhabit.rs
-===================================================================
---- rust.orig/tests/ui/consts/const-eval/ub-uninhabit.rs
-+++ rust/tests/ui/consts/const-eval/ub-uninhabit.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // Strip out raw byte dumps to make comparison platform-independent:
- // normalize-stderr-test "(the raw bytes of the constant) \(size: [0-9]*, align: [0-9]*\)" -> "$1 (size: $$SIZE, align: $$ALIGN)"
- // normalize-stderr-test "([0-9a-f][0-9a-f] |╾─*a(lloc)?[0-9]+(\+[a-z0-9]+)?─*╼ )+ *│.*" -> "HEX_DUMP"
-Index: rust/tests/ui/consts/const-eval/ub-wide-ptr.rs
-===================================================================
---- rust.orig/tests/ui/consts/const-eval/ub-wide-ptr.rs
-+++ rust/tests/ui/consts/const-eval/ub-wide-ptr.rs
-@@ -1,3 +1,4 @@
-+// ignore-test
- // ignore-tidy-linelength
- #![allow(unused)]
-
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-09 17:49:08 +0000