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.patch104
-rw-r--r--debian/patches/c-disable-fs-specific-test.patch2
-rw-r--r--debian/patches/c-update-libgit2.patch26
-rw-r--r--debian/patches/d-0000-ignore-removed-submodules.patch108
-rw-r--r--debian/patches/d-0001-pkg-config-no-special-snowflake.patch28
-rw-r--r--debian/patches/d-0002-mdbook-strip-embedded-libs.patch88
-rw-r--r--debian/patches/d-0003-cc-psm-rebuild-wasm32.patch18
-rw-r--r--debian/patches/d-0005-no-jemalloc.patch20
-rw-r--r--debian/patches/d-0010-cargo-remove-vendored-c-crates.patch23
-rw-r--r--debian/patches/d-0011-cargo-remove-nghttp2.patch19
-rw-r--r--debian/patches/d-0012-cargo-always-return-dev-channel.patch22
-rw-r--r--debian/patches/d-0020-remove-windows-dependencies.patch356
-rw-r--r--debian/patches/d-0021-vendor-remove-windows-dependencies.patch1041
-rw-r--r--debian/patches/d-armel-fix-lldb.patch2
-rw-r--r--debian/patches/d-bootstrap-cargo-check-cfg.patch2
-rw-r--r--debian/patches/d-bootstrap-cargo-doc-paths.patch98
-rw-r--r--debian/patches/d-bootstrap-custom-debuginfo-path.patch2
-rw-r--r--debian/patches/d-bootstrap-disable-git.patch4
-rw-r--r--debian/patches/d-bootstrap-no-assume-tools.patch2
-rw-r--r--debian/patches/d-bootstrap-read-beta-version-from-file.patch37
-rw-r--r--debian/patches/d-bootstrap-rustflags.patch2
-rw-r--r--debian/patches/d-disable-download-tests.patch4
-rw-r--r--debian/patches/d-fix-rustix-outline.patch2
-rw-r--r--debian/patches/d-rustc-add-soname.patch2
-rw-r--r--debian/patches/d-rustc-fix-mips64el-bootstrap.patch2
-rw-r--r--debian/patches/series3
-rw-r--r--debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch40
-rw-r--r--debian/patches/u-fix-get-toml-when-test.patch55
-rw-r--r--debian/patches/u-profiler.patch18
-rw-r--r--debian/patches/u-reproducible-dl-stage0.patch22
-rw-r--r--debian/patches/ubuntu-disable-ppc64el-asm-tests.patch4
31 files changed, 1128 insertions, 1028 deletions
diff --git a/debian/patches/c-2002_disable-net-tests.patch b/debian/patches/c-2002_disable-net-tests.patch
index 2e99a9e9a..3f8926877 100644
--- a/debian/patches/c-2002_disable-net-tests.patch
+++ b/debian/patches/c-2002_disable-net-tests.patch
@@ -51,7 +51,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
===================================================================
--- rust.orig/src/tools/cargo/tests/testsuite/publish.rs
+++ rust/src/tools/cargo/tests/testsuite/publish.rs
-@@ -85,7 +85,7 @@ fn validate_upload_li() {
+@@ -88,7 +88,7 @@ fn validate_upload_li() {
);
}
@@ -60,7 +60,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple() {
let registry = RegistryBuilder::new().http_api().http_index().build();
-@@ -127,7 +127,7 @@ You may press ctrl-c to skip waiting; th
+@@ -130,7 +130,7 @@ You may press ctrl-c to skip waiting; th
// Check that the `token` key works at the root instead of under a
// `[registry]` table.
@@ -69,7 +69,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_publish_with_http() {
let _reg = registry::RegistryBuilder::new()
.http_api()
-@@ -167,7 +167,7 @@ You may press ctrl-c to skip waiting; th
+@@ -170,7 +170,7 @@ You may press ctrl-c to skip waiting; th
.run();
}
@@ -78,7 +78,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_publish_with_asymmetric() {
let _reg = registry::RegistryBuilder::new()
.http_api()
-@@ -210,7 +210,7 @@ You may press ctrl-c to skip waiting; th
+@@ -213,7 +213,7 @@ You may press ctrl-c to skip waiting; th
.run();
}
@@ -87,7 +87,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn old_token_location() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -267,7 +267,7 @@ You may press ctrl-c [..]
+@@ -270,7 +270,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -96,7 +96,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn simple_with_index() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -312,7 +312,7 @@ You may press ctrl-c [..]
+@@ -315,7 +315,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -105,7 +105,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn git_deps() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -350,7 +350,7 @@ the `git` specification will be removed
+@@ -353,7 +353,7 @@ the `git` specification will be removed
.run();
}
@@ -114,7 +114,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn path_dependency_no_version() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -390,7 +390,7 @@ the `path` specification will be removed
+@@ -393,7 +393,7 @@ the `path` specification will be removed
.run();
}
@@ -123,7 +123,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn unpublishable_crate() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -423,7 +423,7 @@ fn unpublishable_crate() {
+@@ -426,7 +426,7 @@ fn unpublishable_crate() {
.run();
}
@@ -132,7 +132,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn dont_publish_dirty() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -465,7 +465,7 @@ to proceed despite this and include the
+@@ -468,7 +468,7 @@ to proceed despite this and include the
.run();
}
@@ -141,7 +141,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_clean() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -513,7 +513,7 @@ You may press ctrl-c to skip waiting; th
+@@ -516,7 +516,7 @@ You may press ctrl-c to skip waiting; th
// Other tests will verify the endpoint gets the right payload.
}
@@ -150,7 +150,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_in_sub_repo() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -562,7 +562,7 @@ You may press ctrl-c [..]
+@@ -565,7 +565,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -159,7 +159,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_when_ignored() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -611,7 +611,7 @@ You may press ctrl-c [..]
+@@ -614,7 +614,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -168,7 +168,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn ignore_when_crate_ignored() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
-@@ -659,7 +659,7 @@ You may press ctrl-c [..]
+@@ -662,7 +662,7 @@ You may press ctrl-c [..]
// Other tests will verify the endpoint gets the right payload.
}
@@ -177,7 +177,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn new_crate_rejected() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -692,7 +692,7 @@ fn new_crate_rejected() {
+@@ -695,7 +695,7 @@ fn new_crate_rejected() {
.run();
}
@@ -186,7 +186,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn dry_run() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
-@@ -735,7 +735,7 @@ See [..]
+@@ -738,7 +738,7 @@ See [..]
assert!(!registry::api_path().join("api/v1/crates/new").exists());
}
@@ -195,7 +195,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn registry_not_in_publish_list() {
let p = project()
.file(
-@@ -768,7 +768,7 @@ The registry `alternative` is not listed
+@@ -771,7 +771,7 @@ The registry `alternative` is not listed
.run();
}
@@ -204,7 +204,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_empty_list() {
let p = project()
.file(
-@@ -797,7 +797,7 @@ fn publish_empty_list() {
+@@ -800,7 +800,7 @@ fn publish_empty_list() {
.run();
}
@@ -213,7 +213,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_allowed_registry() {
let _registry = RegistryBuilder::new()
.http_api()
-@@ -857,7 +857,7 @@ You may press ctrl-c [..]
+@@ -860,7 +860,7 @@ You may press ctrl-c [..]
);
}
@@ -222,7 +222,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_implicitly_to_only_allowed_registry() {
let _registry = RegistryBuilder::new()
.http_api()
-@@ -918,7 +918,7 @@ You may press ctrl-c [..]
+@@ -921,7 +921,7 @@ You may press ctrl-c [..]
);
}
@@ -231,7 +231,7 @@ Index: rust/src/tools/cargo/tests/testsuite/publish.rs
fn publish_fail_with_no_registry_specified() {
let p = project().build();
-@@ -952,7 +952,7 @@ The registry `crates-io` is not listed i
+@@ -955,7 +955,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(
-@@ -982,7 +982,7 @@ fn block_publish_no_registry() {
+@@ -985,7 +985,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();
-@@ -1035,7 +1035,7 @@ You may press ctrl-c [..]
+@@ -1038,7 +1038,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();
-@@ -1086,7 +1086,7 @@ You may press ctrl-c [..]
+@@ -1089,7 +1089,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();
-@@ -1137,7 +1137,7 @@ You may press ctrl-c [..]
+@@ -1140,7 +1140,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();
-@@ -1173,7 +1173,7 @@ fn publish_with_no_default_features() {
+@@ -1176,7 +1176,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();
-@@ -1278,7 +1278,7 @@ You may press ctrl-c [..]
+@@ -1282,7 +1282,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()
-@@ -1327,7 +1327,7 @@ fn publish_checks_for_token_before_verif
+@@ -1331,7 +1331,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(
-@@ -1376,7 +1376,7 @@ include `--registry crates-io` to use cr
+@@ -1380,7 +1380,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();
-@@ -1519,7 +1519,7 @@ You may press ctrl-c [..]
+@@ -1524,7 +1524,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();
-@@ -1608,7 +1608,7 @@ repository = "foo"
+@@ -1614,7 +1614,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();
-@@ -1664,7 +1664,7 @@ You may press ctrl-c [..]
+@@ -1670,7 +1670,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();
-@@ -1699,7 +1699,7 @@ fn index_requires_token() {
+@@ -1705,7 +1705,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()
-@@ -1728,7 +1728,7 @@ include `--registry dummy-registry` or `
+@@ -1734,7 +1734,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();
-@@ -1773,7 +1773,7 @@ Caused by:
+@@ -1782,7 +1782,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()
-@@ -1821,7 +1821,7 @@ Caused by:
+@@ -1830,7 +1830,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()
-@@ -1869,7 +1869,7 @@ Caused by:
+@@ -1878,7 +1878,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()
-@@ -1923,7 +1923,7 @@ Caused by:
+@@ -1932,7 +1932,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()
-@@ -1973,7 +1973,7 @@ Caused by:
+@@ -1982,7 +1982,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()
-@@ -2023,7 +2023,7 @@ Caused by:
+@@ -2032,7 +2032,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();
-@@ -2074,7 +2074,7 @@ You may press ctrl-c [..]
+@@ -2084,7 +2084,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();
-@@ -2126,7 +2126,7 @@ fn with_duplicate_spec_in_members() {
+@@ -2136,7 +2136,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();
-@@ -2176,7 +2176,7 @@ You may press ctrl-c [..]
+@@ -2187,7 +2187,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();
-@@ -2212,7 +2212,7 @@ fn in_virtual_workspace() {
+@@ -2223,7 +2223,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();
-@@ -2269,7 +2269,7 @@ You may press ctrl-c [..]
+@@ -2281,7 +2281,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();
-@@ -2314,7 +2314,7 @@ error: package ID specification `li` did
+@@ -2326,7 +2326,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();
-@@ -2371,7 +2371,7 @@ error: the `-p` argument must be specifi
+@@ -2383,7 +2383,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
-@@ -2418,7 +2418,7 @@ error: package ID specification `bar` di
+@@ -2430,7 +2430,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();
-@@ -2479,7 +2479,7 @@ You may press ctrl-c [..]
+@@ -2491,7 +2491,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));
-@@ -2561,7 +2561,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2573,7 +2573,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));
-@@ -2657,7 +2657,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2669,7 +2669,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));
-@@ -2749,7 +2749,7 @@ You may press ctrl-c to skip waiting; th
+@@ -2761,7 +2761,7 @@ You may press ctrl-c to skip waiting; th
p.cargo("check").with_status(0).run();
}
diff --git a/debian/patches/c-disable-fs-specific-test.patch b/debian/patches/c-disable-fs-specific-test.patch
index eda4f925b..ccdc0ba81 100644
--- a/debian/patches/c-disable-fs-specific-test.patch
+++ b/debian/patches/c-disable-fs-specific-test.patch
@@ -2,7 +2,7 @@ Index: rust/src/tools/cargo/tests/testsuite/metadata.rs
===================================================================
--- rust.orig/src/tools/cargo/tests/testsuite/metadata.rs
+++ rust/src/tools/cargo/tests/testsuite/metadata.rs
-@@ -3935,7 +3935,7 @@ fn dep_kinds_workspace() {
+@@ -3988,7 +3988,7 @@ fn dep_kinds_workspace() {
// Creating non-utf8 path is an OS-specific pain, so let's run this only on
// linux, where arbitrary bytes work.
#[cfg(target_os = "linux")]
diff --git a/debian/patches/c-update-libgit2.patch b/debian/patches/c-update-libgit2.patch
index b004ed095..8fe7c1ca9 100644
--- a/debian/patches/c-update-libgit2.patch
+++ b/debian/patches/c-update-libgit2.patch
@@ -2,31 +2,31 @@ Index: rust/src/tools/cargo/Cargo.toml
===================================================================
--- rust.orig/src/tools/cargo/Cargo.toml
+++ rust/src/tools/cargo/Cargo.toml
-@@ -28,8 +28,8 @@ curl-sys = "0.4.61"
- env_logger = "0.10.0"
+@@ -33,8 +33,8 @@ env_logger = "0.10.0"
filetime = "0.2.9"
flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
--git2 = "0.17.0"
+ fwdansi = "1.1.0"
+-git2 = "0.17.1"
-git2-curl = "0.18.0"
-+git2 = "0.18.0"
++git2 = "0.18"
+git2-curl = "0.19.0"
- gix = { version = "0.39.0", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
- gix-features-for-configuration-only = { version = "0.28.0", package = "gix-features", features = [ "parallel" ] }
+ gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
glob = "0.3.0"
-@@ -47,7 +47,7 @@ jobserver = "0.1.26"
- lazy_static = "1.2.0"
+@@ -53,7 +53,7 @@ jobserver = "0.1.26"
+ lazy_static = "1.3.0"
lazycell = "1.2.0"
- libc = "0.2"
--libgit2-sys = "0.15.0"
+ libc = "0.2.144"
+-libgit2-sys = "0.15.1"
+libgit2-sys = "0.16.1"
- log = "0.4.6"
+ log = "0.4.17"
memchr = "2.1.3"
- opener = "0.5"
+ miow = "0.5.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
-@@ -14,7 +14,7 @@ cargo-util = { path = "../cargo-util" }
+@@ -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"] }
diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 3b11a1b63..e90237fa8 100644
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -3,22 +3,18 @@ Date: Sat, 2 Oct 2021 01:07:59 +0100
Subject: d-0000-ignore-removed-submodules
---
- Cargo.toml | 17 -----------------
- src/bootstrap/bootstrap.py | 4 ----
- src/bootstrap/builder.rs | 18 +-----------------
- src/bootstrap/doc.rs | 1 -
- src/bootstrap/test.rs | 12 +-----------
- src/tools/clippy/Cargo.toml | 5 -----
- src/tools/rust-analyzer/Cargo.toml | 11 ++++++++++-
- src/tools/rustfmt/Cargo.toml | 5 -----
- src/tools/tidy/src/deps.rs | 4 +++-
- 9 files changed, 15 insertions(+), 62 deletions(-)
+ Cargo.toml | 11 +++-----
+ src/bootstrap/bootstrap.py | 4 ---
+ src/bootstrap/builder.rs | 54 +++++++++-----------------------------
+ src/bootstrap/test.rs | 12 +--------
+ src/tools/rust-analyzer/Cargo.toml | 11 +++++++-
+ 5 files changed, 28 insertions(+), 64 deletions(-)
-Index: rust/Cargo.toml
-===================================================================
---- rust.orig/Cargo.toml
-+++ rust/Cargo.toml
-@@ -18,28 +18,18 @@ members = [
+diff --git a/Cargo.toml b/Cargo.toml
+index 8eb378a..70487ec 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -18,22 +18,15 @@ members = [
"src/tools/tidy",
"src/tools/tier-check",
"src/tools/build-manifest",
@@ -26,12 +22,6 @@ Index: rust/Cargo.toml
- "src/tools/remote-test-server",
"src/tools/rust-installer",
"src/tools/rust-demangler",
- "src/tools/cargo",
- "src/tools/cargo/crates/credential/cargo-credential-1password",
-- "src/tools/cargo/crates/credential/cargo-credential-macos-keychain",
-- "src/tools/cargo/crates/credential/cargo-credential-wincred",
- "src/tools/cargo/crates/mdman",
-- # "src/tools/cargo/crates/resolver-tests",
"src/tools/rustdoc",
- "src/tools/rls",
"src/tools/rustfmt",
@@ -47,11 +37,11 @@ Index: rust/Cargo.toml
"src/tools/replace-version-placeholder",
"src/tools/lld-wrapper",
"src/tools/collect-license-metadata",
-Index: rust/src/bootstrap/bootstrap.py
-===================================================================
---- rust.orig/src/bootstrap/bootstrap.py
-+++ rust/src/bootstrap/bootstrap.py
-@@ -781,10 +781,6 @@ class RustBuild(object):
+diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
+index 58d1926..527282d 100644
+--- a/src/bootstrap/bootstrap.py
++++ b/src/bootstrap/bootstrap.py
+@@ -899,10 +899,6 @@ class RustBuild(object):
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
args.extend("--verbose" for _ in range(verbose_count))
@@ -62,11 +52,11 @@ Index: rust/src/bootstrap/bootstrap.py
if self.get_toml("metrics", "build"):
args.append("--features")
args.append("build-metrics")
-Index: rust/src/bootstrap/builder.rs
-===================================================================
---- rust.orig/src/bootstrap/builder.rs
-+++ rust/src/bootstrap/builder.rs
-@@ -491,20 +491,20 @@ impl<'a> ShouldRun<'a> {
+diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
+index 2fa4455..3f3e5ec 100644
+--- a/src/bootstrap/builder.rs
++++ b/src/bootstrap/builder.rs
+@@ -492,20 +492,20 @@ impl<'a> ShouldRun<'a> {
static SUBMODULES_PATHS: OnceCell<Vec<String>> = OnceCell::new();
let init_submodules_paths = |src: &PathBuf| {
@@ -99,7 +89,7 @@ Index: rust/src/bootstrap/builder.rs
submodules_paths
};
-@@ -658,24 +658,14 @@ impl<'a> Builder<'a> {
+@@ -672,25 +672,14 @@ impl<'a> Builder<'a> {
tool::Linkchecker,
tool::CargoTest,
tool::Compiletest,
@@ -120,11 +110,12 @@ Index: rust/src/bootstrap/builder.rs
- tool::Miri,
- tool::CargoMiri,
- llvm::Lld,
-- llvm::CrtBeginEnd
+- llvm::CrtBeginEnd,
+- tool::RustdocGUITest,
),
Kind::Check | Kind::Clippy | Kind::Fix => describe!(
check::Std,
-@@ -683,11 +673,6 @@ impl<'a> Builder<'a> {
+@@ -698,11 +687,6 @@ impl<'a> Builder<'a> {
check::Rustdoc,
check::CodegenBackend,
check::Clippy,
@@ -136,15 +127,15 @@ Index: rust/src/bootstrap/builder.rs
check::Rustfmt,
check::Bootstrap
),
-@@ -717,7 +702,6 @@ impl<'a> Builder<'a> {
- test::ReplacePlaceholderTest,
+@@ -730,7 +714,6 @@ impl<'a> Builder<'a> {
+ test::TierCheck,
test::Cargotest,
test::Cargo,
- test::RustAnalyzer,
test::ErrorIndex,
test::Distcheck,
test::RunMakeFullDeps,
-@@ -734,7 +717,6 @@ impl<'a> Builder<'a> {
+@@ -746,7 +729,6 @@ impl<'a> Builder<'a> {
test::EmbeddedBook,
test::EditionGuide,
test::Rustfmt,
@@ -152,7 +143,7 @@ Index: rust/src/bootstrap/builder.rs
test::Clippy,
test::RustDemangler,
test::CompiletestTest,
-@@ -771,7 +753,6 @@ impl<'a> Builder<'a> {
+@@ -783,7 +765,6 @@ impl<'a> Builder<'a> {
doc::CargoBook,
doc::Clippy,
doc::ClippyBook,
@@ -160,7 +151,7 @@ Index: rust/src/bootstrap/builder.rs
doc::EmbeddedBook,
doc::EditionGuide,
doc::StyleGuide,
-@@ -787,12 +768,9 @@ impl<'a> Builder<'a> {
+@@ -801,12 +782,9 @@ impl<'a> Builder<'a> {
dist::Analysis,
dist::Src,
dist::Cargo,
@@ -173,7 +164,7 @@ Index: rust/src/bootstrap/builder.rs
dist::LlvmTools,
dist::RustDev,
dist::Bootstrap,
-@@ -809,11 +786,9 @@ impl<'a> Builder<'a> {
+@@ -823,11 +801,9 @@ impl<'a> Builder<'a> {
install::Docs,
install::Std,
install::Cargo,
@@ -185,15 +176,15 @@ Index: rust/src/bootstrap/builder.rs
install::LlvmTools,
install::Src,
install::Rustc
-@@ -824,7 +798,6 @@ impl<'a> Builder<'a> {
+@@ -837,7 +813,6 @@ impl<'a> Builder<'a> {
run::BuildManifest,
run::BumpStage0,
run::ReplaceVersionPlaceholder,
- run::Miri,
run::CollectLicenseMetadata,
run::GenerateCopyright,
- ),
-@@ -1949,10 +1922,7 @@ impl<'a> Builder<'a> {
+ run::GenerateWindowsSys,
+@@ -1979,10 +1954,7 @@ impl<'a> Builder<'a> {
}
}
@@ -205,11 +196,11 @@ Index: rust/src/bootstrap/builder.rs
cargo.arg("--frozen");
}
-Index: rust/src/bootstrap/test.rs
-===================================================================
---- rust.orig/src/bootstrap/test.rs
-+++ rust/src/bootstrap/test.rs
-@@ -2070,17 +2070,7 @@ impl Step for RustcGuide {
+diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
+index 44cd84b..9b37d5d 100644
+--- a/src/bootstrap/test.rs
++++ b/src/bootstrap/test.rs
+@@ -2004,17 +2004,7 @@ impl Step for RustcGuide {
}
fn run(self, builder: &Builder<'_>) {
@@ -228,10 +219,10 @@ Index: rust/src/bootstrap/test.rs
}
}
-Index: rust/src/tools/rust-analyzer/Cargo.toml
-===================================================================
---- rust.orig/src/tools/rust-analyzer/Cargo.toml
-+++ rust/src/tools/rust-analyzer/Cargo.toml
+diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
+index 333f03c..2a0faa2 100644
+--- a/src/tools/rust-analyzer/Cargo.toml
++++ b/src/tools/rust-analyzer/Cargo.toml
@@ -1,5 +1,14 @@
[workspace]
-members = ["xtask/", "lib/*", "crates/*"]
@@ -248,16 +239,3 @@ Index: rust/src/tools/rust-analyzer/Cargo.toml
exclude = ["crates/proc-macro-test/imp"]
[workspace.package]
-Index: rust/src/tools/rustc-workspace-hack/Cargo.toml
-===================================================================
---- rust.orig/src/tools/rustc-workspace-hack/Cargo.toml
-+++ rust/src/tools/rustc-workspace-hack/Cargo.toml
-@@ -74,7 +74,7 @@ features = [
- [dependencies]
- bstr = { version = "0.2.17", features = ["default"] }
- clap = { version = "3.1.1", features = ["derive", "clap_derive"]}
--curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
-+curl-sys = { version = "0.4.13", features = ["http2"], optional = true }
- # Ensure `extra_traits` of libc, which is used transitively by Cargo.
- libc = { version = "0.2", features = ["extra_traits"] }
- # Ensure `js` of getrandom, which is (unfortunately) used transitively by Cargo.
diff --git a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
index 20cb4fd73..9e49580b1 100644
--- a/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
+++ b/debian/patches/d-0001-pkg-config-no-special-snowflake.patch
@@ -7,11 +7,11 @@ Subject: d-0001-pkg-config-no-special-snowflake
vendor/pkg-config/tests/test.rs | 2 --
2 files changed, 10 insertions(+), 17 deletions(-)
-Index: rust/vendor/pkg-config/src/lib.rs
-===================================================================
---- rust.orig/vendor/pkg-config/src/lib.rs
-+++ rust/vendor/pkg-config/src/lib.rs
-@@ -111,11 +111,8 @@ pub enum Error {
+diff --git a/vendor/pkg-config/src/lib.rs b/vendor/pkg-config/src/lib.rs
+index e9395be..2f6819c 100644
+--- a/vendor/pkg-config/src/lib.rs
++++ b/vendor/pkg-config/src/lib.rs
+@@ -117,11 +117,8 @@ pub enum Error {
/// Contains the name of the responsible environment variable.
EnvNoPkgConfig(String),
@@ -25,7 +25,7 @@ Index: rust/vendor/pkg-config/src/lib.rs
CrossCompilation,
/// Failed to run `pkg-config`.
-@@ -155,14 +152,6 @@ impl fmt::Display for Error {
+@@ -161,14 +158,6 @@ impl fmt::Display for Error {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
match *self {
Error::EnvNoPkgConfig(ref name) => write!(f, "Aborted because {} is set", name),
@@ -40,7 +40,7 @@ Index: rust/vendor/pkg-config/src/lib.rs
Error::Command {
ref command,
ref cause,
-@@ -219,7 +208,7 @@ impl fmt::Display for Error {
+@@ -226,7 +215,7 @@ impl fmt::Display for Error {
)?;
format_output(output, f)
}
@@ -49,7 +49,7 @@ Index: rust/vendor/pkg-config/src/lib.rs
}
}
}
-@@ -411,6 +400,8 @@ impl Config {
+@@ -418,6 +407,8 @@ impl Config {
if host == target {
return true;
}
@@ -58,7 +58,7 @@ Index: rust/vendor/pkg-config/src/lib.rs
// pkg-config may not be aware of cross-compilation, and require
// a wrapper script that sets up platform-specific prefixes.
-@@ -470,7 +461,11 @@ impl Config {
+@@ -477,7 +468,11 @@ impl Config {
fn command(&self, name: &str, args: &[&str]) -> Command {
let exe = self
.targetted_env_var("PKG_CONFIG")
@@ -71,11 +71,11 @@ Index: rust/vendor/pkg-config/src/lib.rs
let mut cmd = Command::new(exe);
if self.is_static(name) {
cmd.arg("--static");
-Index: rust/vendor/pkg-config/tests/test.rs
-===================================================================
---- rust.orig/vendor/pkg-config/tests/test.rs
-+++ rust/vendor/pkg-config/tests/test.rs
-@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config
+diff --git a/vendor/pkg-config/tests/test.rs b/vendor/pkg-config/tests/test.rs
+index 4e04ac0..f884e46 100644
+--- a/vendor/pkg-config/tests/test.rs
++++ b/vendor/pkg-config/tests/test.rs
+@@ -34,7 +34,6 @@ fn find(name: &str) -> Result<pkg_config::Library, Error> {
pkg_config::probe_library(name)
}
diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
index 662b139ae..568bf230f 100644
--- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
+++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
@@ -13,10 +13,10 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase
vendor/mdbook/src/theme/searcher/mod.rs | 2 -
7 files changed, 47 insertions(+), 240 deletions(-)
-Index: rust/src/tools/linkchecker/main.rs
-===================================================================
---- rust.orig/src/tools/linkchecker/main.rs
-+++ rust/src/tools/linkchecker/main.rs
+diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
+index c8a3700..4095c03 100644
+--- a/src/tools/linkchecker/main.rs
++++ b/src/tools/linkchecker/main.rs
@@ -159,7 +159,17 @@ impl Checker {
for entry in t!(dir.read_dir()).map(|e| t!(e)) {
let path = entry.path();
@@ -66,10 +66,10 @@ Index: rust/src/tools/linkchecker/main.rs
if is_exception(file, &target_pretty_path) {
report.links_ignored_exception += 1;
} else {
-Index: rust/vendor/mdbook/src/book/init.rs
-===================================================================
---- rust.orig/vendor/mdbook/src/book/init.rs
-+++ rust/vendor/mdbook/src/book/init.rs
+diff --git a/vendor/mdbook/src/book/init.rs b/vendor/mdbook/src/book/init.rs
+index ebcdd93..41dab42 100644
+--- a/vendor/mdbook/src/book/init.rs
++++ b/vendor/mdbook/src/book/init.rs
@@ -153,25 +153,6 @@ impl BookBuilder {
let mut js = File::create(themedir.join("book.js"))?;
js.write_all(theme::JS)?;
@@ -96,11 +96,11 @@ Index: rust/vendor/mdbook/src/book/init.rs
Ok(())
}
-Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-===================================================================
---- rust.orig/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-+++ rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
-@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config,
+diff --git a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
+index e170e2f..caa2eff 100644
+--- a/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
++++ b/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
+@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Config, HtmlConfig, Playground, RustEdition};
use crate::errors::*;
use crate::renderer::html_handlebars::helpers;
use crate::renderer::{RenderContext, Renderer};
@@ -129,10 +129,7 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
- destination,
- "FontAwesome/css/font-awesome.css",
- theme::FONT_AWESOME,
-+ symlink(
-+ "/usr/share/fonts-font-awesome/css/font-awesome.min.css",
-+ destination.join("css/font-awesome.min.css"),
- )?;
+- )?;
- write_file(
- destination,
- "FontAwesome/fonts/fontawesome-webfont.eot",
@@ -143,38 +140,41 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
- "FontAwesome/fonts/fontawesome-webfont.svg",
- theme::FONT_AWESOME_SVG,
+ symlink(
-+ "/usr/share/fonts-font-awesome/fonts",
-+ destination.join("fonts"),
++ "/usr/share/fonts-font-awesome/css/font-awesome.min.css",
++ destination.join("css/font-awesome.min.css"),
)?;
- write_file(
- destination,
- "FontAwesome/fonts/fontawesome-webfont.ttf",
- theme::FONT_AWESOME_TTF,
+ symlink(
-+ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css",
-+ destination.join("highlight.css"),
++ "/usr/share/fonts-font-awesome/fonts",
++ destination.join("fonts"),
)?;
- write_file(
- destination,
- "FontAwesome/fonts/fontawesome-webfont.woff",
- theme::FONT_AWESOME_WOFF,
+ symlink(
-+ "/usr/share/javascript/highlight.js/highlight.js",
-+ destination.join("highlight.js"),
++ "/usr/share/javascript/highlight.js/styles/atelier-dune-light.css",
++ destination.join("highlight.css"),
)?;
- write_file(
- destination,
- "FontAwesome/fonts/fontawesome-webfont.woff2",
- theme::FONT_AWESOME_WOFF2,
+ symlink(
-+ "/usr/share/javascript/mathjax/MathJax.js",
-+ destination.join("MathJax.js"),
++ "/usr/share/javascript/highlight.js/highlight.js",
++ destination.join("highlight.js"),
)?;
- write_file(
- destination,
- "FontAwesome/fonts/FontAwesome.ttf",
- theme::FONT_AWESOME_TTF,
-- )?;
++ symlink(
++ "/usr/share/javascript/mathjax/MathJax.js",
++ destination.join("MathJax.js"),
+ )?;
- if html_config.copy_fonts {
- write_file(destination, "fonts/fonts.css", theme::fonts::CSS)?;
- for (file_name, contents) in theme::fonts::LICENSES.iter() {
@@ -237,11 +237,11 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/hbs_renderer.rs
Ok(())
}
-Index: rust/vendor/mdbook/src/renderer/html_handlebars/search.rs
-===================================================================
---- rust.orig/vendor/mdbook/src/renderer/html_handlebars/search.rs
-+++ rust/vendor/mdbook/src/renderer/html_handlebars/search.rs
-@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Sear
+diff --git a/vendor/mdbook/src/renderer/html_handlebars/search.rs b/vendor/mdbook/src/renderer/html_handlebars/search.rs
+index a9e2f5c..3e3f69c 100644
+--- a/vendor/mdbook/src/renderer/html_handlebars/search.rs
++++ b/vendor/mdbook/src/renderer/html_handlebars/search.rs
+@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
format!("Object.assign(window.search, {});", index).as_bytes(),
)?;
utils::fs::write_file(destination, "searcher.js", searcher::JS)?;
@@ -250,10 +250,10 @@ Index: rust/vendor/mdbook/src/renderer/html_handlebars/search.rs
debug!("Copying search files ✓");
}
-Index: rust/vendor/mdbook/src/theme/index.hbs
-===================================================================
---- rust.orig/vendor/mdbook/src/theme/index.hbs
-+++ rust/vendor/mdbook/src/theme/index.hbs
+diff --git a/vendor/mdbook/src/theme/index.hbs b/vendor/mdbook/src/theme/index.hbs
+index 6f3948c..7e5c54c 100644
+--- a/vendor/mdbook/src/theme/index.hbs
++++ b/vendor/mdbook/src/theme/index.hbs
@@ -33,10 +33,7 @@
{{/if}}
@@ -381,10 +381,10 @@ Index: rust/vendor/mdbook/src/theme/index.hbs
<!-- Custom JS scripts -->
{{#each additional_js}}
-Index: rust/vendor/mdbook/src/theme/mod.rs
-===================================================================
---- rust.orig/vendor/mdbook/src/theme/mod.rs
-+++ rust/vendor/mdbook/src/theme/mod.rs
+diff --git a/vendor/mdbook/src/theme/mod.rs b/vendor/mdbook/src/theme/mod.rs
+index 6e6b509..ef8886b 100644
+--- a/vendor/mdbook/src/theme/mod.rs
++++ b/vendor/mdbook/src/theme/mod.rs
@@ -1,9 +1,5 @@
#![allow(missing_docs)]
@@ -395,7 +395,7 @@ Index: rust/vendor/mdbook/src/theme/mod.rs
#[cfg(feature = "search")]
pub mod searcher;
-@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = includ
+@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css");
pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png");
pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg");
pub static JS: &[u8] = include_bytes!("book.js");
@@ -461,10 +461,10 @@ Index: rust/vendor/mdbook/src/theme/mod.rs
};
assert_eq!(got, empty);
-Index: rust/vendor/mdbook/src/theme/searcher/mod.rs
-===================================================================
---- rust.orig/vendor/mdbook/src/theme/searcher/mod.rs
-+++ rust/vendor/mdbook/src/theme/searcher/mod.rs
+diff --git a/vendor/mdbook/src/theme/searcher/mod.rs b/vendor/mdbook/src/theme/searcher/mod.rs
+index d5029db..59eda8a 100644
+--- a/vendor/mdbook/src/theme/searcher/mod.rs
++++ b/vendor/mdbook/src/theme/searcher/mod.rs
@@ -2,5 +2,3 @@
//! the "search" cargo feature is disabled.
diff --git a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
index 057b7ee8d..53003c7ed 100644
--- a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
+++ b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
@@ -7,11 +7,11 @@ Subject: d-0003-cc-psm-rebuild-wasm32
vendor/psm/build.rs | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
-Index: rust/vendor/cc/src/lib.rs
-===================================================================
---- rust.orig/vendor/cc/src/lib.rs
-+++ rust/vendor/cc/src/lib.rs
-@@ -2389,7 +2389,7 @@ impl Build {
+diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs
+index abc5d7a..cc1cecc 100644
+--- a/vendor/cc/src/lib.rs
++++ b/vendor/cc/src/lib.rs
+@@ -2407,7 +2407,7 @@ impl Build {
|| target == "wasm32-unknown-wasi"
|| target == "wasm32-unknown-unknown"
{
@@ -20,10 +20,10 @@ Index: rust/vendor/cc/src/lib.rs
} else if target.contains("vxworks") {
if self.cpp {
"wr-c++".to_string()
-Index: rust/vendor/psm/build.rs
-===================================================================
---- rust.orig/vendor/psm/build.rs
-+++ rust/vendor/psm/build.rs
+diff --git a/vendor/psm/build.rs b/vendor/psm/build.rs
+index 9d40212..e39549d 100644
+--- a/vendor/psm/build.rs
++++ b/vendor/psm/build.rs
@@ -50,7 +50,7 @@ fn find_assembly(
("sparc", _, _, _) => Some(("src/arch/sparc_sysv.s", true)),
("riscv32", _, _, _) => Some(("src/arch/riscv.s", true)),
diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch
index 1223fce8b..17254fb53 100644
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/d-0005-no-jemalloc.patch
@@ -7,11 +7,11 @@ Subject: d-0005-no-jemalloc
src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 --
2 files changed, 8 deletions(-)
-Index: rust/compiler/rustc/Cargo.toml
-===================================================================
---- rust.orig/compiler/rustc/Cargo.toml
-+++ rust/compiler/rustc/Cargo.toml
-@@ -14,13 +14,7 @@ rustc_codegen_ssa = { path = "../rustc_c
+diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
+index 41003ad..0578f7b 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
rustc_smir = { path = "../rustc_smir" }
@@ -25,10 +25,10 @@ Index: rust/compiler/rustc/Cargo.toml
llvm = ['rustc_driver_impl/llvm']
max_level_info = ['rustc_driver_impl/max_level_info']
rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler']
-Index: rust/src/tools/rust-analyzer/crates/profile/Cargo.toml
-===================================================================
---- rust.orig/src/tools/rust-analyzer/crates/profile/Cargo.toml
-+++ rust/src/tools/rust-analyzer/crates/profile/Cargo.toml
+diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
+index 6273ea5..642fb05 100644
+--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
@@ -17,7 +17,6 @@ cfg-if = "1.0.0"
libc = "0.2.135"
la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
@@ -37,7 +37,7 @@ Index: rust/src/tools/rust-analyzer/crates/profile/Cargo.toml
[target.'cfg(target_os = "linux")'.dependencies]
perf-event = "0.4.7"
-@@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features =
+@@ -27,7 +26,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
[features]
cpu_profiler = []
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 b386a3a5f..7c31b69d9 100644
--- a/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
+++ b/debian/patches/d-0010-cargo-remove-vendored-c-crates.patch
@@ -1,14 +1,17 @@
-Description: Remove embeded C libraries in bundled crates
-Author: Zixing Liu <zixing.liu@canonical.com>
-Forwarded: not-needed
+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
+
Last-Update: 2023-05-17
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/src/tools/cargo/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/Cargo.toml
-+++ rust/src/tools/cargo/Cargo.toml
-@@ -114,6 +114,5 @@ test = false
+ src/tools/cargo/Cargo.toml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
+index 05c95c7..a7475f6 100644
+--- a/src/tools/cargo/Cargo.toml
++++ b/src/tools/cargo/Cargo.toml
+@@ -206,8 +206,6 @@ test = false
doc = false
[features]
@@ -16,3 +19,5 @@ Index: rust/src/tools/cargo/Cargo.toml
-vendored-libgit2 = ["libgit2-sys/vendored"]
+# Debian: removed vendoring flags
pretty-env-logger = ["pretty_env_logger"]
+ # This is primarily used by rust-lang/rust distributing cargo the executable.
+-all-static = ['vendored-openssl', 'curl/static-curl', 'curl/force-system-lib-on-osx']
diff --git a/debian/patches/d-0011-cargo-remove-nghttp2.patch b/debian/patches/d-0011-cargo-remove-nghttp2.patch
index b7ea72c53..00e59567c 100644
--- a/debian/patches/d-0011-cargo-remove-nghttp2.patch
+++ b/debian/patches/d-0011-cargo-remove-nghttp2.patch
@@ -1,13 +1,16 @@
-Description: Remove nghttp2 from curl-sys crate
-Author: Zixing Liu <zixing.liu@canonical.com>
-Forwarded: not-needed
+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>
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/vendor/curl-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/curl-sys/Cargo.toml
-+++ rust/vendor/curl-sys/Cargo.toml
+ 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 945ee8e..04b9800 100644
+--- a/vendor/curl-sys/Cargo.toml
++++ b/vendor/curl-sys/Cargo.toml
@@ -52,7 +52,7 @@ version = "0.3.3"
[features]
default = ["ssl"]
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 73554bb89..f643a446f 100644
--- a/debian/patches/d-0012-cargo-always-return-dev-channel.patch
+++ b/debian/patches/d-0012-cargo-always-return-dev-channel.patch
@@ -1,15 +1,17 @@
-Description: Enable nightly features for Cargo
- Debhelper scripts use some nightly features.
-Author: Zixing Liu <zixing.liu@canonical.com>
-Forwarded: not-needed
+From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+Date: Mon, 6 May 2024 10:25:32 +0200
+Subject: d-0012-cargo-always-return-dev-channel
+
Last-Update: 2023-05-30
---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: rust/src/tools/cargo/src/cargo/core/features.rs
-===================================================================
---- rust.orig/src/tools/cargo/src/cargo/core/features.rs
-+++ rust/src/tools/cargo/src/cargo/core/features.rs
-@@ -1182,9 +1182,8 @@ pub fn channel() -> String {
+ src/tools/cargo/src/cargo/core/features.rs | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs
+index d56054a..4c2aa4b 100644
+--- a/src/tools/cargo/src/cargo/core/features.rs
++++ b/src/tools/cargo/src/cargo/core/features.rs
+@@ -1183,9 +1183,8 @@ pub fn channel() -> String {
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 0e5230716..624f3bcfd 100644
--- a/debian/patches/d-0020-remove-windows-dependencies.patch
+++ b/debian/patches/d-0020-remove-windows-dependencies.patch
@@ -1,13 +1,47 @@
-Index: rust/compiler/rustc_data_structures/Cargo.toml
+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
+
===================================================================
---- rust.orig/compiler/rustc_data_structures/Cargo.toml
-+++ rust/compiler/rustc_data_structures/Cargo.toml
-@@ -38,16 +38,6 @@ itertools = "0.10.1"
+---
+ 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 | 3 --
+ src/bootstrap/Cargo.toml | 15 --------
+ src/tools/cargo/Cargo.toml | 17 ---------
+ .../cargo/crates/cargo-test-support/Cargo.toml | 41 ++++++++++------------
+ src/tools/cargo/crates/cargo-util/Cargo.toml | 7 ----
+ src/tools/cargo/crates/home/Cargo.toml | 3 --
+ src/tools/compiletest/Cargo.toml | 10 ------
+ .../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 ----
+ src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 ---
+ 14 files changed, 19 insertions(+), 122 deletions(-)
+
+diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
+index 0ac12d3..3f483ab 100644
+--- a/compiler/rustc_codegen_ssa/Cargo.toml
++++ b/compiler/rustc_codegen_ssa/Cargo.toml
+@@ -49,7 +49,3 @@ libc = "0.2.50"
+ version = "0.31.1"
+ default-features = false
+ features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"]
+-
+-[target.'cfg(windows)'.dependencies.windows]
+-version = "0.48.0"
+-features = ["Win32_Globalization"]
+diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
+index 78f73d1..fce2ee0 100644
+--- a/compiler/rustc_data_structures/Cargo.toml
++++ b/compiler/rustc_data_structures/Cargo.toml
+@@ -37,16 +37,6 @@ itertools = "0.10.1"
[dependencies.parking_lot]
version = "0.11"
-[target.'cfg(windows)'.dependencies.windows]
--version = "0.46.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
@@ -19,16 +53,16 @@ Index: rust/compiler/rustc_data_structures/Cargo.toml
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
memmap2 = "0.2.1"
-Index: rust/compiler/rustc_driver_impl/Cargo.toml
-===================================================================
---- rust.orig/compiler/rustc_driver_impl/Cargo.toml
-+++ rust/compiler/rustc_driver_impl/Cargo.toml
-@@ -54,12 +54,6 @@ rustc_hir_analysis = { path = "../rustc_
+diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
+index 67352c5..f27cb40 100644
+--- a/compiler/rustc_driver_impl/Cargo.toml
++++ b/compiler/rustc_driver_impl/Cargo.toml
+@@ -56,12 +56,6 @@ rustc_mir_transform = { path = "../rustc_mir_transform" }
[target.'cfg(unix)'.dependencies]
libc = "0.2"
-[target.'cfg(windows)'.dependencies.windows]
--version = "0.46.0"
+-version = "0.48.0"
-features = [
- "Win32_System_Diagnostics_Debug",
-]
@@ -36,45 +70,75 @@ Index: rust/compiler/rustc_driver_impl/Cargo.toml
[features]
llvm = ['rustc_interface/llvm']
max_level_info = ['rustc_log/max_level_info']
-Index: rust/compiler/rustc_errors/Cargo.toml
-===================================================================
---- rust.orig/compiler/rustc_errors/Cargo.toml
-+++ rust/compiler/rustc_errors/Cargo.toml
-@@ -25,14 +25,5 @@ termize = "0.1.1"
+diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml
+index bd3033f..83c8036 100644
+--- a/compiler/rustc_errors/Cargo.toml
++++ b/compiler/rustc_errors/Cargo.toml
+@@ -26,13 +26,5 @@ termize = "0.1.1"
serde = { version = "1.0.125", features = [ "derive" ] }
serde_json = "1.0.59"
-[target.'cfg(windows)'.dependencies.windows]
--version = "0.46.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Security",
- "Win32_System_Threading",
-- "Win32_System_WindowsProgramming",
-]
-
[features]
rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler']
-Index: rust/compiler/rustc_session/Cargo.toml
-===================================================================
---- rust.orig/compiler/rustc_session/Cargo.toml
-+++ rust/compiler/rustc_session/Cargo.toml
+diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml
+index 3af83aa..c3d2a00 100644
+--- a/compiler/rustc_session/Cargo.toml
++++ b/compiler/rustc_session/Cargo.toml
@@ -23,10 +23,3 @@ termize = "0.1.1"
[target.'cfg(unix)'.dependencies]
libc = "0.2"
-
-[target.'cfg(windows)'.dependencies.windows]
--version = "0.46.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_System_LibraryLoader",
-]
-Index: rust/src/bootstrap/Cargo.toml
-===================================================================
---- rust.orig/src/bootstrap/Cargo.toml
-+++ rust/src/bootstrap/Cargo.toml
-@@ -61,25 +61,6 @@ sysinfo = { version = "0.26.0", optional
+diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml
+index 4779091..aa78771 100644
+--- a/library/backtrace/Cargo.toml
++++ b/library/backtrace/Cargo.toml
+@@ -45,9 +45,6 @@ version = "0.30.0"
+ default-features = false
+ features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
+
+-[target.'cfg(windows)'.dependencies]
+-winapi = { version = "0.3.9", optional = true }
+-
+ [build-dependencies]
+ # Only needed for Android, but cannot be target dependent
+ # https://github.com/rust-lang/cargo/issues/4932
+@@ -85,16 +82,6 @@ libbacktrace = []
+ libunwind = []
+ unix-backtrace = []
+ verify-winapi = [
+- 'winapi/dbghelp',
+- 'winapi/handleapi',
+- 'winapi/libloaderapi',
+- 'winapi/memoryapi',
+- 'winapi/minwindef',
+- 'winapi/processthreadsapi',
+- 'winapi/synchapi',
+- 'winapi/tlhelp32',
+- 'winapi/winbase',
+- 'winapi/winnt',
+ ]
+
+ [[example]]
+diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
+index 367c619..72c9992 100644
+--- a/src/bootstrap/Cargo.toml
++++ b/src/bootstrap/Cargo.toml
+@@ -63,21 +63,6 @@ semver = "1.0.17"
[target.'cfg(not(target_os = "solaris"))'.dependencies]
fd-lock = "3.0.8"
@@ -86,13 +150,9 @@ Index: rust/src/bootstrap/Cargo.toml
-features = [
- "Win32_Foundation",
- "Win32_Security",
-- "Win32_Storage_FileSystem",
- "Win32_System_Diagnostics_Debug",
-- "Win32_System_IO",
-- "Win32_System_Ioctl",
- "Win32_System_JobObjects",
- "Win32_System_ProcessStatus",
-- "Win32_System_SystemServices",
- "Win32_System_Threading",
- "Win32_System_Time",
-]
@@ -100,11 +160,132 @@ Index: rust/src/bootstrap/Cargo.toml
[dev-dependencies]
pretty_assertions = "1.2"
-Index: rust/src/tools/compiletest/Cargo.toml
-===================================================================
---- rust.orig/src/tools/compiletest/Cargo.toml
-+++ rust/src/tools/compiletest/Cargo.toml
-@@ -23,13 +23,3 @@ lazycell = "1.3.0"
+diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
+index a7475f6..4ad22f5 100644
+--- a/src/tools/cargo/Cargo.toml
++++ b/src/tools/cargo/Cargo.toml
+@@ -2,7 +2,9 @@
+ resolver = "2"
+ members = [
+ "crates/*",
+- "credential/*",
++ "credential/cargo-credential",
++ "credential/cargo-credential-1password",
++ "credential/cargo-credential-gnome-secret",
+ "benches/benchsuite",
+ "benches/capture",
+ ]
+@@ -91,7 +93,6 @@ unicode-xid = "0.2.0"
+ url = "2.2.2"
+ varisat = "0.2.1"
+ walkdir = "2.3.1"
+-windows-sys = "0.48"
+
+ [package]
+ name = "cargo"
+@@ -174,22 +175,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 = [
+- "Win32_Foundation",
+- "Win32_Storage_FileSystem",
+- "Win32_System_Console",
+- "Win32_System_IO",
+- "Win32_System_Threading",
+- "Win32_System_JobObjects",
+- "Win32_Security",
+- "Win32_System_SystemServices"
+-]
+-
+ [dev-dependencies]
+ 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 305c809a..c656678 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
+-
+-[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 f01705f..138690f 100644
+--- a/src/tools/cargo/crates/cargo-util/Cargo.toml
++++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
+@@ -19,10 +19,3 @@ same-file.workspace = true
+ shell-escape.workspace = true
+ tempfile.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"] }
+diff --git a/src/tools/cargo/crates/home/Cargo.toml b/src/tools/cargo/crates/home/Cargo.toml
+index 6c65ecc1..11fd255 100644
+--- a/src/tools/cargo/crates/home/Cargo.toml
++++ b/src/tools/cargo/crates/home/Cargo.toml
+@@ -15,6 +15,3 @@ license = "MIT OR Apache-2.0"
+ readme = "README.md"
+ 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"] }
+diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
+index d2f2583..61f7be4 100644
+--- a/src/tools/compiletest/Cargo.toml
++++ b/src/tools/compiletest/Cargo.toml
+@@ -27,13 +27,3 @@ anyhow = "1"
[target.'cfg(unix)'.dependencies]
libc = "0.2"
@@ -113,30 +294,15 @@ Index: rust/src/tools/compiletest/Cargo.toml
-miow = "0.5"
-
-[target.'cfg(windows)'.dependencies.windows]
--version = "0.46.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_System_Diagnostics_Debug",
-]
-Index: rust/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-===================================================================
---- rust.orig/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-+++ rust/src/tools/rust-analyzer/crates/stdx/Cargo.toml
-@@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", option
- always-assert = { version = "0.1.2", features = ["log"] }
- # Think twice before adding anything here
-
--[target.'cfg(windows)'.dependencies]
--miow = "0.5.0"
--winapi = { version = "0.3.9", features = ["winerror"] }
--
- [features]
- # Uncomment to enable for the whole crate graph
- # default = [ "backtrace" ]
-Index: rust/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-===================================================================
---- rust.orig/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
-+++ rust/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+index f0f1900..3137edb 100644
+--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
++++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -67,12 +67,6 @@ tt.workspace = true
vfs-notify.workspace = true
vfs.workspace = true
@@ -150,64 +316,32 @@ Index: rust/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
[dev-dependencies]
expect-test = "1.4.0"
jod-thread = "0.1.2"
-Index: rust/src/tools/cargo/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/Cargo.toml
-+++ rust/src/tools/cargo/Cargo.toml
-@@ -82,22 +82,6 @@ walkdir = "2.2"
- # for more information.
- rustc-workspace-hack = "1.0.0"
+diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
+index 642fb05..0883bb7 100644
+--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
++++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
+@@ -21,9 +21,6 @@ countme = { version = "3.0.1", features = ["enable"] }
+ [target.'cfg(target_os = "linux")'.dependencies]
+ perf-event = "0.4.7"
-[target.'cfg(windows)'.dependencies]
--fwdansi = "1.1.0"
+-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
-
--[target.'cfg(windows)'.dependencies.windows-sys]
--version = "0.45"
--features = [
-- "Win32_Foundation",
-- "Win32_Storage_FileSystem",
-- "Win32_System_Console",
-- "Win32_System_IO",
-- "Win32_System_Threading",
-- "Win32_System_JobObjects",
-- "Win32_Security",
-- "Win32_System_SystemServices"
--]
--
- [dev-dependencies]
- cargo-test-macro = { path = "crates/cargo-test-macro" }
- cargo-test-support = { path = "crates/cargo-test-support" }
-Index: rust/src/tools/cargo/crates/cargo-util/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/crates/cargo-util/Cargo.toml
-+++ rust/src/tools/cargo/crates/cargo-util/Cargo.toml
-@@ -22,7 +22,3 @@ walkdir = "2.3.1"
+ [features]
+ cpu_profiler = []
+
+diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
+index c881f2f..5cb4cb0 100644
+--- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml
++++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
+@@ -17,10 +17,6 @@ backtrace = { version = "0.3.65", optional = true }
+ always-assert = { version = "0.1.2", features = ["log"] }
+ # Think twice before adding anything here
- [target.'cfg(target_os = "macos")'.dependencies]
- core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] }
--
-[target.'cfg(windows)'.dependencies]
-miow = "0.5.0"
--windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem", "Win32_Foundation", "Win32_System_Console"] }
-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
-@@ -27,6 +27,3 @@ termcolor = "1.1.2"
- time = { version = "0.3", features = ["parsing", "formatting"]}
- toml = "0.7.0"
- url = "2.2.2"
--
--[target.'cfg(windows)'.dependencies]
--windows-sys = { version = "0.45.0", features = ["Win32_Storage_FileSystem"] }
-Index: rust/src/tools/cargo/crates/home/Cargo.toml
-===================================================================
---- rust.orig/src/tools/cargo/crates/home/Cargo.toml
-+++ rust/src/tools/cargo/crates/home/Cargo.toml
-@@ -15,6 +15,3 @@ license = "MIT OR Apache-2.0"
- readme = "README.md"
- repository = "https://github.com/rust-lang/cargo"
- description = "Shared definitions of home directories."
+-winapi = { version = "0.3.9", features = ["winerror"] }
-
--[target.'cfg(windows)'.dependencies]
--windows-sys = { version = "0.45.0", features = ["Win32_Foundation", "Win32_UI_Shell"] }
+ [features]
+ # Uncomment to enable for the whole crate graph
+ # default = [ "backtrace" ]
diff --git a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
index 9a2994a34..8796a5c92 100644
--- a/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
+++ b/debian/patches/d-0021-vendor-remove-windows-dependencies.patch
@@ -1,45 +1,177 @@
From 1a6f5062adaad5d7f1a4f1cf792f4ee8c3c17e9f Mon Sep 17 00:00:00 2001
-From: liushuyu <zixing.liu@canonical.com>
+From: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Date: Wed, 6 Sep 2023 13:23:24 -0600
Subject: [PATCH] Remove Windows dependencies
+Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
- vendor/anstyle-wincon/Cargo.toml | 7 -------
- vendor/compiletest_rs/Cargo.toml | 3 ---
- vendor/concolor-query/Cargo.toml | 7 -------
- vendor/errno/Cargo.toml | 7 -------
- vendor/fd-lock/Cargo.toml | 8 --------
- vendor/filetime/Cargo.toml | 7 -------
- vendor/gix-sec/Cargo.toml | 10 ----------
- vendor/home/Cargo.toml | 7 -------
- vendor/io-lifetimes/Cargo.toml | 13 -------------
- vendor/is-terminal/Cargo.toml | 8 --------
- vendor/parking_lot_core/Cargo.toml | 9 ---------
- vendor/rustix/Cargo.toml | 9 ---------
- vendor/snapbox/Cargo.toml | 6 ------
- vendor/tempfile/Cargo.toml | 7 -------
- vendor/terminal_size/Cargo.toml | 7 -------
- 15 files changed, 115 deletions(-)
+ vendor/anstream/Cargo.toml | 6 +----
+ vendor/atty/Cargo.toml | 3 ---
+ vendor/backtrace/Cargo.toml | 13 -----------
+ vendor/chrono/Cargo.toml | 11 ---------
+ vendor/colored/Cargo.toml | 4 ----
+ vendor/compiletest_rs/Cargo.toml | 6 -----
+ vendor/concolor-query/Cargo.toml | 7 ------
+ vendor/ctrlc/Cargo.toml | 18 ---------------
+ vendor/curl-sys/Cargo.toml | 10 ---------
+ vendor/curl/Cargo.toml | 10 ---------
+ vendor/dirs-sys-next/Cargo.toml | 3 ---
+ vendor/dirs-sys/Cargo.toml | 3 ---
+ vendor/errno-0.3.0/Cargo.toml | 7 ------
+ vendor/errno/Cargo.toml | 6 -----
+ vendor/fd-lock/Cargo.toml | 8 -------
+ vendor/filetime-0.2.20/Cargo.toml | 7 ------
+ vendor/filetime/Cargo.toml | 7 ------
+ vendor/gix-discover/Cargo.toml | 3 ---
+ vendor/gix-sec/Cargo.toml | 13 -----------
+ vendor/home-0.5.4/Cargo.toml | 8 -------
+ vendor/home/Cargo.toml | 7 ------
+ vendor/iana-time-zone/Cargo.toml | 4 ----
+ vendor/ignore-0.4.18/Cargo.toml | 2 --
+ vendor/ignore/Cargo.toml | 3 ---
+ vendor/io-close/Cargo.toml | 3 ---
+ vendor/io-lifetimes-1.0.9/Cargo.toml | 13 -----------
+ vendor/io-lifetimes/Cargo.toml | 13 -----------
+ vendor/is-terminal-0.4.6/Cargo.toml | 11 ---------
+ vendor/is-terminal/Cargo.toml | 11 ---------
+ vendor/libloading/Cargo.toml | 7 ------
+ vendor/libssh2-sys/Cargo.toml | 4 ----
+ vendor/nu-ansi-term/Cargo.toml | 10 ---------
+ vendor/opener-0.5.0/Cargo.toml | 3 ---
+ vendor/opener/Cargo.toml | 4 ----
+ vendor/os_info/Cargo.toml | 15 -------------
+ vendor/parking_lot_core-0.8.6/Cargo.toml | 12 ----------
+ vendor/parking_lot_core-0.9.6/Cargo.toml | 9 --------
+ vendor/parking_lot_core/Cargo.toml | 9 --------
+ vendor/pretty_assertions/Cargo.toml | 6 -----
+ vendor/remove_dir_all/Cargo.toml | 3 ---
+ vendor/rustix-0.37.6/Cargo.toml | 12 ----------
+ vendor/rustix-0.37.7/Cargo.toml | 12 ----------
+ vendor/rustix/Cargo.toml | 17 --------------
+ vendor/same-file/Cargo.toml | 2 --
+ vendor/snapbox/Cargo.toml | 11 ---------
+ vendor/socket2-0.4.1/Cargo.toml | 3 ---
+ vendor/socket2/Cargo.toml | 8 -------
+ vendor/stacker/Cargo.toml | 10 ---------
+ vendor/sysinfo/Cargo.toml | 38 --------------------------------
+ vendor/tempfile-3.3.0/Cargo.toml | 3 ---
+ vendor/tempfile/Cargo.toml | 7 ------
+ vendor/term/Cargo.toml | 6 -----
+ vendor/termcolor/Cargo.toml | 3 ---
+ vendor/terminal_size/Cargo.toml | 7 ------
+ vendor/termize/Cargo.toml | 3 ---
+ vendor/tokio/Cargo.toml | 6 -----
+ vendor/uuid/Cargo.toml | 4 ----
+ vendor/walkdir-2.3.2/Cargo.toml | 6 -----
+ vendor/walkdir/Cargo.toml | 3 ---
+ 59 files changed, 1 insertion(+), 462 deletions(-)
-Index: rust/vendor/compiletest_rs/Cargo.toml
-===================================================================
---- rust.orig/vendor/compiletest_rs/Cargo.toml
-+++ rust/vendor/compiletest_rs/Cargo.toml
-@@ -74,10 +74,3 @@ tmp = ["tempfile"]
-
+diff --git a/vendor/anstream/Cargo.toml b/vendor/anstream/Cargo.toml
+index eb04906..7e2ed64 100644
+--- a/vendor/anstream/Cargo.toml
++++ b/vendor/anstream/Cargo.toml
+@@ -137,8 +137,4 @@ default = [
+ "auto",
+ "wincon",
+ ]
+-wincon = ["dep:anstyle-wincon"]
+-
+-[target."cfg(windows)".dependencies.anstyle-wincon]
+-version = "0.2.0"
+-optional = true
++wincon = []
+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 96f4146..4a48f6e 100644
+--- a/vendor/backtrace/Cargo.toml
++++ b/vendor/backtrace/Cargo.toml
+@@ -127,18 +127,5 @@ serialize-serde = ["serde"]
+ std = []
+ unix-backtrace = []
+ verify-winapi = [
+- "winapi/dbghelp",
+- "winapi/handleapi",
+- "winapi/libloaderapi",
+- "winapi/memoryapi",
+- "winapi/minwindef",
+- "winapi/processthreadsapi",
+- "winapi/synchapi",
+- "winapi/tlhelp32",
+- "winapi/winbase",
+- "winapi/winnt",
+ ]
+
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.9"
+-optional = true
+diff --git a/vendor/chrono/Cargo.toml b/vendor/chrono/Cargo.toml
+index eaf0e69..79ab5f9 100644
+--- a/vendor/chrono/Cargo.toml
++++ b/vendor/chrono/Cargo.toml
+@@ -114,7 +114,6 @@ __internal_bench = ["criterion"]
+ alloc = []
+ clock = [
+ "std",
+- "winapi",
+ "iana-time-zone",
+ ]
+ default = [
+@@ -150,13 +149,3 @@ version = "0.3"
+ version = "0.1.45"
+ features = ["fallback"]
+ optional = true
-
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3.0"
+-features = [
+- "std",
+- "minwinbase",
+- "minwindef",
+- "timezoneapi",
+-]
+-optional = true
+diff --git a/vendor/colored/Cargo.toml b/vendor/colored/Cargo.toml
+index 3a6b59b..065eecb 100644
+--- a/vendor/colored/Cargo.toml
++++ b/vendor/colored/Cargo.toml
+@@ -33,7 +33,3 @@ version = "=1.0.0-beta.3"
+
+ [features]
+ no-color = []
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["consoleapi", "processenv", "winbase"]
+-default-features = false
+diff --git a/vendor/compiletest_rs/Cargo.toml b/vendor/compiletest_rs/Cargo.toml
+index c1b3ecd..cae8c30 100644
+--- a/vendor/compiletest_rs/Cargo.toml
++++ b/vendor/compiletest_rs/Cargo.toml
+@@ -75,9 +75,3 @@ tmp = ["tempfile"]
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2"
+
-[target."cfg(windows)".dependencies.miow]
-version = "0.3"
-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["winerror"]
-Index: rust/vendor/concolor-query/Cargo.toml
-===================================================================
---- rust.orig/vendor/concolor-query/Cargo.toml
-+++ rust/vendor/concolor-query/Cargo.toml
+diff --git a/vendor/concolor-query/Cargo.toml b/vendor/concolor-query/Cargo.toml
+index a25ce89..c578c4c 100644
+--- a/vendor/concolor-query/Cargo.toml
++++ b/vendor/concolor-query/Cargo.toml
@@ -33,10 +33,3 @@ keywords = [
categories = ["command-line-interface"]
license = "MIT OR Apache-2.0"
@@ -51,25 +183,90 @@ Index: rust/vendor/concolor-query/Cargo.toml
- "Win32_System_Console",
- "Win32_Foundation",
-]
-Index: rust/vendor/errno/Cargo.toml
-===================================================================
---- rust.orig/vendor/errno/Cargo.toml
-+++ rust/vendor/errno/Cargo.toml
-@@ -40,10 +40,3 @@ version = "0.2"
+diff --git a/vendor/curl-sys/Cargo.toml b/vendor/curl-sys/Cargo.toml
+index 04b9800..4a4968d 100644
+--- a/vendor/curl-sys/Cargo.toml
++++ b/vendor/curl-sys/Cargo.toml
+@@ -73,16 +73,6 @@ zlib-ng-compat = [
+ version = "0.9"
+ optional = true
+
+-[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
+-version = "0.2"
+-
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = [
+- "winsock2",
+- "ws2def",
+-]
+-
+ [badges.appveyor]
+ repository = "alexcrichton/curl-rust"
+
+diff --git a/vendor/curl/Cargo.toml b/vendor/curl/Cargo.toml
+index bfb59f4..d9f6854 100644
+--- a/vendor/curl/Cargo.toml
++++ b/vendor/curl/Cargo.toml
+@@ -107,16 +107,6 @@ optional = true
+ version = "0.9.43"
+ optional = true
+
+-[target."cfg(target_env = \"msvc\")".dependencies.schannel]
+-version = "0.1.13"
+-
+-[target."cfg(target_env = \"msvc\")".dependencies.winapi]
+-version = "0.3"
+-features = [
+- "libloaderapi",
+- "wincrypt",
+-]
+-
+ [badges.appveyor]
+ repository = "alexcrichton/curl-rust"
+diff --git a/vendor/dirs-sys-next/Cargo.toml b/vendor/dirs-sys-next/Cargo.toml
+index e9d8d0c..acb2eb7 100644
+--- a/vendor/dirs-sys-next/Cargo.toml
++++ b/vendor/dirs-sys-next/Cargo.toml
+@@ -25,8 +25,5 @@ version = "0.4.0"
+ default-features = false
[target."cfg(unix)".dependencies.libc]
version = "0.2"
--
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
+ [badges.maintenance]
+ status = "as-is"
+diff --git a/vendor/dirs-sys/Cargo.toml b/vendor/dirs-sys/Cargo.toml
+index 6c41007..4d79134 100644
+--- a/vendor/dirs-sys/Cargo.toml
++++ b/vendor/dirs-sys/Cargo.toml
+@@ -23,6 +23,3 @@ version = "0.4"
+ default-features = false
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2"
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
+diff --git a/vendor/errno/Cargo.toml b/vendor/errno/Cargo.toml
+index bf54b1f..7507a31 100644
+--- a/vendor/errno/Cargo.toml
++++ b/vendor/errno/Cargo.toml
+@@ -41,9 +41,3 @@ version = "0.2"
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2"
+
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45"
+-version = "0.48"
-features = [
- "Win32_Foundation",
- "Win32_System_Diagnostics_Debug",
-]
-Index: rust/vendor/fd-lock/Cargo.toml
-===================================================================
---- rust.orig/vendor/fd-lock/Cargo.toml
-+++ rust/vendor/fd-lock/Cargo.toml
+diff --git a/vendor/fd-lock/Cargo.toml b/vendor/fd-lock/Cargo.toml
+index d995177..b759d87 100644
+--- a/vendor/fd-lock/Cargo.toml
++++ b/vendor/fd-lock/Cargo.toml
@@ -43,11 +43,3 @@ version = "3.0.8"
[target."cfg(unix)".dependencies.rustix]
version = "0.37.0"
@@ -82,32 +279,35 @@ Index: rust/vendor/fd-lock/Cargo.toml
- "Win32_Storage_FileSystem",
- "Win32_System_IO",
-]
-Index: rust/vendor/filetime/Cargo.toml
-===================================================================
---- rust.orig/vendor/filetime/Cargo.toml
-+++ rust/vendor/filetime/Cargo.toml
+diff --git a/vendor/filetime/Cargo.toml b/vendor/filetime/Cargo.toml
+index 8547ec3..4ecd973 100644
+--- a/vendor/filetime/Cargo.toml
++++ b/vendor/filetime/Cargo.toml
@@ -38,10 +38,3 @@ version = "0.2.9"
[target."cfg(unix)".dependencies.libc]
version = "0.2.27"
-
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
-]
-Index: rust/vendor/gix-sec/Cargo.toml
-===================================================================
---- rust.orig/vendor/gix-sec/Cargo.toml
-+++ rust/vendor/gix-sec/Cargo.toml
-@@ -64,13 +64,3 @@ version = "4"
-
- [target."cfg(windows)".dependencies.gix-path]
- version = "^0.7.1"
+diff --git a/vendor/gix-sec/Cargo.toml b/vendor/gix-sec/Cargo.toml
+index 44a3e884..041a6bb 100644
+--- a/vendor/gix-sec/Cargo.toml
++++ b/vendor/gix-sec/Cargo.toml
+@@ -61,16 +61,3 @@ serde = [
+
+ [target."cfg(not(windows))".dependencies.libc]
+ version = "0.2.123"
+-
+-[target."cfg(windows)".dependencies.gix-path]
+-version = "^0.8.0"
-
-[target."cfg(windows)".dependencies.windows]
--version = "0.43.0"
+-version = "0.48"
-features = [
- "Win32_Foundation",
- "Win32_Security_Authorization",
@@ -115,25 +315,59 @@ Index: rust/vendor/gix-sec/Cargo.toml
- "Win32_System_Memory",
- "Win32_System_Threading",
-]
-Index: rust/vendor/home/Cargo.toml
-===================================================================
---- rust.orig/vendor/home/Cargo.toml
-+++ rust/vendor/home/Cargo.toml
+diff --git a/vendor/home/Cargo.toml b/vendor/home/Cargo.toml
+index cd608b1..eecfb89 100644
+--- a/vendor/home/Cargo.toml
++++ b/vendor/home/Cargo.toml
@@ -27,10 +27,3 @@ readme = "README.md"
license = "MIT OR Apache-2.0"
- repository = "https://github.com/brson/home"
-
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
+ repository = "https://github.com/rust-lang/cargo"
+ resolver = "2"
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
-features = [
-- "shlobj",
-- "std",
-- "winerror",
+- "Win32_Foundation",
+- "Win32_UI_Shell",
-]
-Index: rust/vendor/io-lifetimes/Cargo.toml
-===================================================================
---- rust.orig/vendor/io-lifetimes/Cargo.toml
-+++ rust/vendor/io-lifetimes/Cargo.toml
+diff --git a/vendor/iana-time-zone/Cargo.toml b/vendor/iana-time-zone/Cargo.toml
+index 5cdc175..271a062 100644
+--- a/vendor/iana-time-zone/Cargo.toml
++++ b/vendor/iana-time-zone/Cargo.toml
+@@ -52,7 +52,3 @@ version = "0.1.5"
+
+ [target."cfg(target_os = \"haiku\")".dependencies.iana-time-zone-haiku]
+ version = "0.1.1"
+-
+-[target."cfg(target_os = \"windows\")".dependencies.windows]
+-version = "0.48.0"
+-features = ["Globalization"]
+diff --git a/vendor/ignore/Cargo.toml b/vendor/ignore/Cargo.toml
+index b397dcf..2022a87 100644
+--- a/vendor/ignore/Cargo.toml
++++ b/vendor/ignore/Cargo.toml
+@@ -64,6 +64,3 @@ version = "0.5.0"
+
+ [features]
+ simd-accel = ["globset/simd-accel"]
+-
+-[target."cfg(windows)".dependencies.winapi-util]
+-version = "0.1.2"
+diff --git a/vendor/io-close/Cargo.toml b/vendor/io-close/Cargo.toml
+index 5e36444..82f9ce5 100644
+--- a/vendor/io-close/Cargo.toml
++++ b/vendor/io-close/Cargo.toml
+@@ -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"]
+diff --git a/vendor/io-lifetimes/Cargo.toml b/vendor/io-lifetimes/Cargo.toml
+index b9ed913..0fd300a 100644
+--- a/vendor/io-lifetimes/Cargo.toml
++++ b/vendor/io-lifetimes/Cargo.toml
@@ -43,7 +43,6 @@ optional = true
close = [
"libc",
@@ -148,7 +382,7 @@ Index: rust/vendor/io-lifetimes/Cargo.toml
optional = true
-
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
@@ -158,17 +392,17 @@ Index: rust/vendor/io-lifetimes/Cargo.toml
- "Win32_System_Threading",
-]
-optional = true
-Index: rust/vendor/is-terminal/Cargo.toml
-===================================================================
---- rust.orig/vendor/is-terminal/Cargo.toml
-+++ rust/vendor/is-terminal/Cargo.toml
+diff --git a/vendor/is-terminal/Cargo.toml b/vendor/is-terminal/Cargo.toml
+index 7957a9c..0ab2ae1 100644
+--- a/vendor/is-terminal/Cargo.toml
++++ b/vendor/is-terminal/Cargo.toml
@@ -53,14 +53,3 @@ features = ["termios"]
[target."cfg(target_os = \"hermit\")".dependencies.hermit-abi]
version = "0.3.0"
-
-[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
@@ -177,334 +411,45 @@ Index: rust/vendor/is-terminal/Cargo.toml
-
-[target."cfg(windows)".dev-dependencies.tempfile]
-version = "3"
-Index: rust/vendor/parking_lot_core/Cargo.toml
-===================================================================
---- rust.orig/vendor/parking_lot_core/Cargo.toml
-+++ rust/vendor/parking_lot_core/Cargo.toml
-@@ -58,11 +58,3 @@ version = "0.2.8"
- [target."cfg(unix)".dependencies.libc]
- version = "0.2.95"
+diff --git a/vendor/libloading/Cargo.toml b/vendor/libloading/Cargo.toml
+index 65168d5..7785a7e 100644
+--- a/vendor/libloading/Cargo.toml
++++ b/vendor/libloading/Cargo.toml
+@@ -42,10 +42,3 @@ version = "1.1"
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.42.0"
--features = [
-- "Win32_Foundation",
-- "Win32_System_LibraryLoader",
-- "Win32_System_SystemServices",
-- "Win32_System_WindowsProgramming",
--]
-Index: rust/vendor/rustix/Cargo.toml
-===================================================================
---- rust.orig/vendor/rustix/Cargo.toml
-+++ rust/vendor/rustix/Cargo.toml
-@@ -233,14 +233,3 @@ package = "errno"
- version = "1.5.2"
- optional = true
-
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.45.0"
--features = [
-- "Win32_Foundation",
-- "Win32_Networking_WinSock",
-- "Win32_NetworkManagement_IpHelper",
-- "Win32_System_Threading",
--]
--
--[target."cfg(windows)".dev-dependencies.ctor]
--version = "0.1.21"
-Index: rust/vendor/tempfile/Cargo.toml
-===================================================================
---- rust.orig/vendor/tempfile/Cargo.toml
-+++ rust/vendor/tempfile/Cargo.toml
-@@ -38,6 +38,3 @@ nightly = []
- version = "0.2.27"
- [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
- version = "0.2.9"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["fileapi", "handleapi", "winbase"]
-Index: rust/vendor/terminal_size/Cargo.toml
-===================================================================
---- rust.orig/vendor/terminal_size/Cargo.toml
-+++ rust/vendor/terminal_size/Cargo.toml
-@@ -30,10 +30,3 @@ repository = "https://github.com/eminenc
- [target."cfg(not(windows))".dependencies.rustix]
- version = "0.36.3"
- features = ["termios"]
--
--[target."cfg(windows)".dependencies.windows-sys]
--version = "0.42.0"
--features = [
-- "Win32_Foundation",
-- "Win32_System_Console",
--]
-Index: rust/vendor/curl/Cargo.toml
-===================================================================
---- rust.orig/vendor/curl/Cargo.toml
-+++ rust/vendor/curl/Cargo.toml
-@@ -107,16 +107,6 @@ optional = true
- version = "0.9.43"
- optional = true
-
--[target."cfg(target_env = \"msvc\")".dependencies.schannel]
--version = "0.1.13"
--
--[target."cfg(target_env = \"msvc\")".dependencies.winapi]
--version = "0.3"
--features = [
-- "libloaderapi",
-- "wincrypt",
--]
--
- [badges.appveyor]
- repository = "alexcrichton/curl-rust"
-
-Index: rust/vendor/uuid/Cargo.toml
-===================================================================
---- rust.orig/vendor/uuid/Cargo.toml
-+++ rust/vendor/uuid/Cargo.toml
-@@ -64,7 +64,7 @@ version = "1.0.56"
-
- [features]
- default = ["std"]
--guid = ["winapi"]
-+guid = []
- std = []
- stdweb = ["getrandom", "getrandom/js"]
- v1 = []
-@@ -72,9 +72,6 @@ v3 = ["md5"]
- v4 = ["getrandom"]
- v5 = ["sha1"]
- wasm-bindgen = ["getrandom", "getrandom/js"]
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--optional = true
- [badges.appveyor]
- repository = "uuid-rs/uuid"
-
-Index: rust/vendor/anstream/Cargo.toml
-===================================================================
---- rust.orig/vendor/anstream/Cargo.toml
-+++ rust/vendor/anstream/Cargo.toml
-@@ -137,8 +137,5 @@ default = [
- "auto",
- "wincon",
- ]
--wincon = ["dep:anstyle-wincon"]
-+wincon = []
-
--[target."cfg(windows)".dependencies.anstyle-wincon]
--version = "0.2.0"
--optional = true
-Index: rust/vendor/atty/Cargo.toml
-===================================================================
---- rust.orig/vendor/atty/Cargo.toml
-+++ rust/vendor/atty/Cargo.toml
-@@ -27,8 +27,5 @@ version = "0.1.6"
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
- default-features = false
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["consoleapi", "processenv", "minwinbase", "minwindef", "winbase"]
- [badges.travis-ci]
- repository = "softprops/atty"
-Index: rust/vendor/backtrace/Cargo.toml
-===================================================================
---- rust.orig/vendor/backtrace/Cargo.toml
-+++ rust/vendor/backtrace/Cargo.toml
-@@ -127,18 +127,4 @@ serialize-serde = ["serde"]
- std = []
- unix-backtrace = []
- verify-winapi = [
-- "winapi/dbghelp",
-- "winapi/handleapi",
-- "winapi/libloaderapi",
-- "winapi/memoryapi",
-- "winapi/minwindef",
-- "winapi/processthreadsapi",
-- "winapi/synchapi",
-- "winapi/tlhelp32",
-- "winapi/winbase",
-- "winapi/winnt",
- ]
--
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.9"
--optional = true
-Index: rust/vendor/chrono/Cargo.toml
-===================================================================
---- rust.orig/vendor/chrono/Cargo.toml
-+++ rust/vendor/chrono/Cargo.toml
-@@ -93,7 +93,7 @@ version = "1"
- __doctest = []
- __internal_bench = []
- alloc = []
--clock = ["libc", "std", "winapi"]
-+clock = ["libc", "std"]
- default = ["clock", "std", "oldtime"]
- oldtime = ["time"]
- std = []
-@@ -108,10 +108,6 @@ version = "0.2"
- optional = true
- [target."cfg(all(target_arch = \"wasm32\", not(any(target_os = \"emscripten\", target_os = \"wasi\"))))".dev-dependencies.wasm-bindgen-test]
- version = "0.3"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.0"
--features = ["std", "minwinbase", "minwindef", "timezoneapi"]
--optional = true
- [badges.appveyor]
- repository = "chronotope/chrono"
-
-Index: rust/vendor/colored/Cargo.toml
-===================================================================
---- rust.orig/vendor/colored/Cargo.toml
-+++ rust/vendor/colored/Cargo.toml
-@@ -33,7 +33,3 @@ version = "=1.0.0-beta.3"
-
- [features]
- no-color = []
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["consoleapi", "processenv", "winbase"]
--default-features = false
-Index: rust/vendor/concolor/Cargo.toml
-===================================================================
---- rust.orig/vendor/concolor/Cargo.toml
-+++ rust/vendor/concolor/Cargo.toml
-@@ -59,7 +59,6 @@ auto = [
- "clicolor",
- "no_color",
- "term",
-- "windows",
- ]
- clicolor = [
- "core",
-@@ -82,7 +81,3 @@ term = [
- "core",
- "concolor-query",
- ]
--windows = [
-- "core",
-- "concolor-query/windows",
--]
-Index: rust/vendor/curl-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/curl-sys/Cargo.toml
-+++ rust/vendor/curl-sys/Cargo.toml
-@@ -63,7 +63,6 @@ ssl = ["openssl-sys"]
- static-curl = []
- static-ssl = ["openssl-sys/vendored"]
- upkeep_7_62_0 = []
--windows-static-ssl = []
- zlib-ng-compat = [
- "libz-sys/zlib-ng",
- "static-curl",
-@@ -73,16 +72,6 @@ zlib-ng-compat = [
- version = "0.9"
- optional = true
-
--[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
--version = "0.2"
--
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = [
-- "winsock2",
-- "ws2def",
--]
--
- [badges.appveyor]
- repository = "alexcrichton/curl-rust"
-
-Index: rust/vendor/dirs-sys-next/Cargo.toml
-===================================================================
---- rust.orig/vendor/dirs-sys-next/Cargo.toml
-+++ rust/vendor/dirs-sys-next/Cargo.toml
-@@ -25,8 +25,5 @@ version = "0.4.0"
- default-features = false
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
- [badges.maintenance]
- status = "as-is"
-Index: rust/vendor/dirs-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/dirs-sys/Cargo.toml
-+++ rust/vendor/dirs-sys/Cargo.toml
-@@ -23,6 +23,3 @@ version = "0.4"
- default-features = false
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
-Index: rust/vendor/errno-0.2.8/Cargo.toml
-===================================================================
---- rust.orig/vendor/errno-0.2.8/Cargo.toml
-+++ rust/vendor/errno-0.2.8/Cargo.toml
-@@ -30,6 +30,3 @@ version = "0.2"
- version = "0.2"
- [target."cfg(unix)".dependencies.libc]
- version = "0.2"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["errhandlingapi", "minwindef", "ntdef", "winbase"]
-Index: rust/vendor/gix-discover/Cargo.toml
-===================================================================
---- rust.orig/vendor/gix-discover/Cargo.toml
-+++ rust/vendor/gix-discover/Cargo.toml
-@@ -60,6 +60,3 @@ version = "3.2.0"
-
- [target."cfg(target_os = \"macos\")".dev-dependencies.defer]
- version = "0.1.0"
--
--[target."cfg(windows)".dependencies.dunce]
--version = "1.0.3"
-Index: rust/vendor/ignore/Cargo.toml
-===================================================================
---- rust.orig/vendor/ignore/Cargo.toml
-+++ rust/vendor/ignore/Cargo.toml
-@@ -57,5 +57,3 @@ version = "0.5.0"
-
- [features]
- simd-accel = ["globset/simd-accel"]
--[target."cfg(windows)".dependencies.winapi-util]
--version = "0.1.2"
-Index: rust/vendor/libloading/Cargo.toml
-===================================================================
---- rust.orig/vendor/libloading/Cargo.toml
-+++ rust/vendor/libloading/Cargo.toml
-@@ -43,9 +43,3 @@ version = "1.1"
[target."cfg(unix)".dependencies.cfg-if]
version = "1"
-
+-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = [
- "errhandlingapi",
- "libloaderapi",
-]
-Index: rust/vendor/libssh2-sys/Cargo.toml
-===================================================================
---- rust.orig/vendor/libssh2-sys/Cargo.toml
-+++ rust/vendor/libssh2-sys/Cargo.toml
-@@ -47,9 +47,6 @@ openssl-on-win32 = ["openssl-sys"]
+diff --git a/vendor/libssh2-sys/Cargo.toml b/vendor/libssh2-sys/Cargo.toml
+index 45f4a71..b0d3e26 100644
+--- a/vendor/libssh2-sys/Cargo.toml
++++ b/vendor/libssh2-sys/Cargo.toml
+@@ -43,7 +43,6 @@ version = "1.0.25"
+ version = "0.3.11"
+
+ [features]
+-openssl-on-win32 = ["openssl-sys"]
vendored-openssl = ["openssl-sys/vendored"]
zlib-ng-compat = ["libz-sys/zlib-ng"]
--[target."cfg(target_env = \"msvc\")".build-dependencies.vcpkg]
--version = "0.2"
--
+@@ -52,7 +51,3 @@ version = "0.2"
+
[target."cfg(unix)".dependencies.openssl-sys]
version = "0.9.35"
-
-Index: rust/vendor/nu-ansi-term/Cargo.toml
-===================================================================
---- rust.orig/vendor/nu-ansi-term/Cargo.toml
-+++ rust/vendor/nu-ansi-term/Cargo.toml
+-
+-[target."cfg(windows)".dependencies.openssl-sys]
+-version = "0.9.35"
+-optional = true
+diff --git a/vendor/nu-ansi-term/Cargo.toml b/vendor/nu-ansi-term/Cargo.toml
+index 209e055..aa40f02 100644
+--- a/vendor/nu-ansi-term/Cargo.toml
++++ b/vendor/nu-ansi-term/Cargo.toml
@@ -45,13 +45,3 @@ version = "1.0.39"
[features]
@@ -519,28 +464,30 @@ Index: rust/vendor/nu-ansi-term/Cargo.toml
- "handleapi",
- "processenv",
-]
-Index: rust/vendor/opener/Cargo.toml
-===================================================================
---- rust.orig/vendor/opener/Cargo.toml
-+++ rust/vendor/opener/Cargo.toml
-@@ -25,9 +25,6 @@ repository = "https://github.com/Seeker1
- version = "0.9"
+diff --git a/vendor/opener/Cargo.toml b/vendor/opener/Cargo.toml
+index 8d91b5e..2d7313b 100644
+--- a/vendor/opener/Cargo.toml
++++ b/vendor/opener/Cargo.toml
+@@ -32,10 +32,6 @@ version = "0.9"
[target."cfg(target_os = \"linux\")".dependencies.bstr]
- version = "0.2"
+ version = "1"
+
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["shellapi"]
+-
[badges.appveyor]
branch = "master"
repository = "Seeker14491/opener"
-Index: rust/vendor/os_info/Cargo.toml
-===================================================================
---- rust.orig/vendor/os_info/Cargo.toml
-+++ rust/vendor/os_info/Cargo.toml
-@@ -48,17 +48,3 @@ version = "1"
+diff --git a/vendor/os_info/Cargo.toml b/vendor/os_info/Cargo.toml
+index 52a062f..e1f347b 100644
+--- a/vendor/os_info/Cargo.toml
++++ b/vendor/os_info/Cargo.toml
+@@ -48,18 +48,3 @@ version = "1"
+
[features]
default = ["serde"]
-
+-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.8"
-features = [
@@ -555,10 +502,10 @@ Index: rust/vendor/os_info/Cargo.toml
- "winerror",
- "winreg",
-]
-Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml
-===================================================================
---- rust.orig/vendor/parking_lot_core-0.8.6/Cargo.toml
-+++ rust/vendor/parking_lot_core-0.8.6/Cargo.toml
+diff --git a/vendor/parking_lot_core-0.8.6/Cargo.toml b/vendor/parking_lot_core-0.8.6/Cargo.toml
+index 6981516..9fb8bd2 100644
+--- a/vendor/parking_lot_core-0.8.6/Cargo.toml
++++ b/vendor/parking_lot_core-0.8.6/Cargo.toml
@@ -60,15 +60,3 @@ version = "0.2.8"
[target."cfg(unix)".dependencies.libc]
@@ -575,23 +522,41 @@ Index: rust/vendor/parking_lot_core-0.8.6/Cargo.toml
- "errhandlingapi",
- "handleapi",
-]
-Index: rust/vendor/pretty_assertions/Cargo.toml
-===================================================================
---- rust.orig/vendor/pretty_assertions/Cargo.toml
-+++ rust/vendor/pretty_assertions/Cargo.toml
-@@ -43,8 +43,3 @@ default = ["std"]
+diff --git a/vendor/parking_lot_core/Cargo.toml b/vendor/parking_lot_core/Cargo.toml
+index 361186b..e00c191 100644
+--- a/vendor/parking_lot_core/Cargo.toml
++++ b/vendor/parking_lot_core/Cargo.toml
+@@ -57,12 +57,3 @@ version = "0.2.8"
+
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2.95"
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.45.0"
+-features = [
+- "Win32_Foundation",
+- "Win32_System_LibraryLoader",
+- "Win32_System_SystemServices",
+- "Win32_System_WindowsProgramming",
+-]
+diff --git a/vendor/pretty_assertions/Cargo.toml b/vendor/pretty_assertions/Cargo.toml
+index f8370f7..4531652 100644
+--- a/vendor/pretty_assertions/Cargo.toml
++++ b/vendor/pretty_assertions/Cargo.toml
+@@ -42,9 +42,3 @@ alloc = []
+ default = ["std"]
std = []
unstable = []
-
+-
-[target."cfg(windows)".dependencies.ctor]
-version = "0.1.9"
-
-[target."cfg(windows)".dependencies.output_vt100]
-version = "0.1.2"
-Index: rust/vendor/remove_dir_all/Cargo.toml
-===================================================================
---- rust.orig/vendor/remove_dir_all/Cargo.toml
-+++ rust/vendor/remove_dir_all/Cargo.toml
+diff --git a/vendor/remove_dir_all/Cargo.toml b/vendor/remove_dir_all/Cargo.toml
+index a847288..aaf637f 100644
+--- a/vendor/remove_dir_all/Cargo.toml
++++ b/vendor/remove_dir_all/Cargo.toml
@@ -23,6 +23,3 @@ license = "MIT/Apache-2.0"
repository = "https://github.com/XAMPPRocky/remove_dir_all.git"
[dev-dependencies.doc-comment]
@@ -599,17 +564,22 @@ Index: rust/vendor/remove_dir_all/Cargo.toml
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["std", "errhandlingapi", "winerror", "fileapi", "winbase"]
-Index: rust/vendor/rustix-0.36.5/Cargo.toml
-===================================================================
---- rust.orig/vendor/rustix-0.36.5/Cargo.toml
-+++ rust/vendor/rustix-0.36.5/Cargo.toml
-@@ -222,15 +222,3 @@ package = "errno"
+diff --git a/vendor/rustix/Cargo.toml b/vendor/rustix/Cargo.toml
+index c928526..6b7cff3 100644
+--- a/vendor/rustix/Cargo.toml
++++ b/vendor/rustix/Cargo.toml
+@@ -233,20 +233,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.42.0"
+-version = "0.48.0"
-features = [
- "Win32_Foundation",
- "Win32_Networking_WinSock",
@@ -618,36 +588,63 @@ Index: rust/vendor/rustix-0.36.5/Cargo.toml
-]
-
-[target."cfg(windows)".dev-dependencies.ctor]
--version = "0.1.21"
-Index: rust/vendor/same-file/Cargo.toml
-===================================================================
---- rust.orig/vendor/same-file/Cargo.toml
-+++ rust/vendor/same-file/Cargo.toml
+-version = "0.2.0"
+diff --git a/vendor/same-file/Cargo.toml b/vendor/same-file/Cargo.toml
+index 4f66820..11ef472 100644
+--- a/vendor/same-file/Cargo.toml
++++ b/vendor/same-file/Cargo.toml
@@ -25,5 +25,3 @@ license = "Unlicense/MIT"
repository = "https://github.com/BurntSushi/same-file"
[dev-dependencies.doc-comment]
version = "0.3"
-[target."cfg(windows)".dependencies.winapi-util]
-version = "0.1.1"
-Index: rust/vendor/socket2/Cargo.toml
-===================================================================
---- rust.orig/vendor/socket2/Cargo.toml
-+++ rust/vendor/socket2/Cargo.toml
-@@ -34,6 +34,3 @@ features = ["all"]
- all = []
+diff --git a/vendor/snapbox/Cargo.toml b/vendor/snapbox/Cargo.toml
+index a9a74e1..8b0bf63 100644
+--- a/vendor/snapbox/Cargo.toml
++++ b/vendor/snapbox/Cargo.toml
+@@ -161,7 +157,6 @@ cmd = [
+ "dep:os_pipe",
+ "dep:wait-timeout",
+ "dep:libc",
+- "dep:windows-sys",
+ ]
+ color = [
+ "dep:anstream",
+@@ -196,8 +190,3 @@ structured-data = ["dep:serde_json"]
[target."cfg(unix)".dependencies.libc]
- version = "0.2.96"
+ version = "0.2.137"
+ optional = true
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.45.0"
+-features = ["Win32_Foundation"]
+-optional = true
+diff --git a/vendor/socket2/Cargo.toml b/vendor/socket2/Cargo.toml
+index 3f1578c..bdac898 100644
+--- a/vendor/socket2/Cargo.toml
++++ b/vendor/socket2/Cargo.toml
+@@ -58,11 +58,3 @@ all = []
+
+ [target."cfg(unix)".dependencies.libc]
+ version = "0.2.139"
+-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.9"
--features = ["handleapi", "ws2ipdef", "ws2tcpip"]
-Index: rust/vendor/stacker/Cargo.toml
-===================================================================
---- rust.orig/vendor/stacker/Cargo.toml
-+++ rust/vendor/stacker/Cargo.toml
-@@ -44,12 +44,3 @@ version = "0.1.7"
+-features = [
+- "handleapi",
+- "ws2ipdef",
+- "ws2tcpip",
+-]
+diff --git a/vendor/stacker/Cargo.toml b/vendor/stacker/Cargo.toml
+index 160cbc0..ba02aac 100644
+--- a/vendor/stacker/Cargo.toml
++++ b/vendor/stacker/Cargo.toml
+@@ -43,13 +43,3 @@ version = "0.1.7"
+
[build-dependencies.cc]
version = "1.0.2"
-
+-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3.6"
-features = [
@@ -657,10 +654,10 @@ Index: rust/vendor/stacker/Cargo.toml
- "processthreadsapi",
- "minwindef",
-]
-Index: rust/vendor/sysinfo/Cargo.toml
-===================================================================
---- rust.orig/vendor/sysinfo/Cargo.toml
-+++ rust/vendor/sysinfo/Cargo.toml
+diff --git a/vendor/sysinfo/Cargo.toml b/vendor/sysinfo/Cargo.toml
+index f8719a4..deb2e40 100644
+--- a/vendor/sysinfo/Cargo.toml
++++ b/vendor/sysinfo/Cargo.toml
@@ -60,41 +60,3 @@ version = "1.0"
[target."cfg(not(any(target_os = \"unknown\", target_arch = \"wasm32\")))".dependencies.libc]
@@ -703,34 +700,68 @@ Index: rust/vendor/sysinfo/Cargo.toml
- "shellapi",
- "std",
-]
-Index: rust/vendor/term/Cargo.toml
-===================================================================
---- rust.orig/vendor/term/Cargo.toml
-+++ rust/vendor/term/Cargo.toml
-@@ -31,9 +31,6 @@ default = []
- [target."cfg(windows)".dependencies.rustversion]
- version = "1"
+diff --git a/vendor/tempfile/Cargo.toml b/vendor/tempfile/Cargo.toml
+index 85006d8..013e986 100644
+--- a/vendor/tempfile/Cargo.toml
++++ b/vendor/tempfile/Cargo.toml
+@@ -50,10 +50,3 @@ features = ["fs"]
+ [target."cfg(target_os = \"redox\")".dependencies.redox_syscall]
+ version = "0.3"
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.45"
+-features = [
+- "Win32_Storage_FileSystem",
+- "Win32_Foundation",
+-]
+diff --git a/vendor/term/Cargo.toml b/vendor/term/Cargo.toml
+index e89261e..ad5d62b 100644
+--- a/vendor/term/Cargo.toml
++++ b/vendor/term/Cargo.toml
+@@ -28,12 +28,6 @@ version = "2"
+
+ [features]
+ default = []
+-[target."cfg(windows)".dependencies.rustversion]
+-version = "1"
+-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["consoleapi", "wincon", "handleapi", "fileapi"]
[badges.appveyor]
repository = "Stebalien/term"
-Index: rust/vendor/termcolor/Cargo.toml
-===================================================================
---- rust.orig/vendor/termcolor/Cargo.toml
-+++ rust/vendor/termcolor/Cargo.toml
-@@ -36,5 +36,3 @@ bench = false
+diff --git a/vendor/termcolor/Cargo.toml b/vendor/termcolor/Cargo.toml
+index dbdb6e8..8edc73e 100644
+--- a/vendor/termcolor/Cargo.toml
++++ b/vendor/termcolor/Cargo.toml
+@@ -35,6 +35,3 @@ name = "termcolor"
+ bench = false
[dev-dependencies]
-
+-
-[target."cfg(windows)".dependencies.winapi-util]
-version = "0.1.3"
-Index: rust/vendor/termize/Cargo.toml
-===================================================================
---- rust.orig/vendor/termize/Cargo.toml
-+++ rust/vendor/termize/Cargo.toml
+diff --git a/vendor/terminal_size/Cargo.toml b/vendor/terminal_size/Cargo.toml
+index 9f31164..6d2d6a5 100644
+--- a/vendor/terminal_size/Cargo.toml
++++ b/vendor/terminal_size/Cargo.toml
+@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size"
+ [target."cfg(not(windows))".dependencies.rustix]
+ version = "0.37.0"
+ features = ["termios"]
+-
+-[target."cfg(windows)".dependencies.windows-sys]
+-version = "0.48.0"
+-features = [
+- "Win32_Foundation",
+- "Win32_System_Console",
+-]
+diff --git a/vendor/termize/Cargo.toml b/vendor/termize/Cargo.toml
+index d248f4d..9bd9f37 100644
+--- a/vendor/termize/Cargo.toml
++++ b/vendor/termize/Cargo.toml
@@ -49,8 +49,5 @@ rpath = false
[dependencies]
[target."cfg(unix)".dependencies.libc]
@@ -740,26 +771,11 @@ Index: rust/vendor/termize/Cargo.toml
-features = ["handleapi", "processenv", "wincon", "winbase"]
[badges.cirrus-ci]
repository = "JohnTitor/termize"
-Index: rust/vendor/time-0.1.43/Cargo.toml
-===================================================================
---- rust.orig/vendor/time-0.1.43/Cargo.toml
-+++ rust/vendor/time-0.1.43/Cargo.toml
-@@ -29,10 +29,3 @@ version = "0.3"
- optional = true
- [dev-dependencies.log]
- version = "0.4"
--
--[dev-dependencies.winapi]
--version = "0.3.0"
--features = ["std", "processthreadsapi", "winbase"]
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3.0"
--features = ["std", "minwinbase", "minwindef", "ntdef", "profileapi", "sysinfoapi", "timezoneapi"]
-Index: rust/vendor/tokio/Cargo.toml
-===================================================================
---- rust.orig/vendor/tokio/Cargo.toml
-+++ rust/vendor/tokio/Cargo.toml
-@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macr
+diff --git a/vendor/tokio/Cargo.toml b/vendor/tokio/Cargo.toml
+index 11ec0c0..bf2ad39 100644
+--- a/vendor/tokio/Cargo.toml
++++ b/vendor/tokio/Cargo.toml
+@@ -95,11 +95,11 @@ full = ["fs", "io-util", "io-std", "macros", "net", "parking_lot", "process", "r
io-std = []
io-util = ["memchr", "bytes"]
macros = ["tokio-macros"]
@@ -784,27 +800,39 @@ Index: rust/vendor/tokio/Cargo.toml
-default-features = false
-[target."cfg(windows)".dev-dependencies.ntapi]
-version = "0.3.6"
-Index: rust/vendor/walkdir/Cargo.toml
-===================================================================
---- rust.orig/vendor/walkdir/Cargo.toml
-+++ rust/vendor/walkdir/Cargo.toml
-@@ -28,12 +28,7 @@ repository = "https://github.com/BurntSu
- version = "1.0.1"
+diff --git a/vendor/uuid/Cargo.toml b/vendor/uuid/Cargo.toml
+index b783688..4e98553 100644
+--- a/vendor/uuid/Cargo.toml
++++ b/vendor/uuid/Cargo.toml
+@@ -180,10 +180,6 @@ package = "wasm-bindgen"
+ [target."cfg(target_arch = \"wasm32\")".dev-dependencies.wasm-bindgen-test]
+ version = "0.3"
+
+-[target."cfg(windows)".dev-dependencies.windows-sys]
+-version = "0.48.0"
+-features = ["Win32_System_Com"]
+-
+ [badges.is-it-maintained-issue-resolution]
+ repository = "uuid-rs/uuid"
+
+diff --git a/vendor/walkdir/Cargo.toml b/vendor/walkdir/Cargo.toml
+index 7db9263..2a9b56f 100644
+--- a/vendor/walkdir/Cargo.toml
++++ b/vendor/walkdir/Cargo.toml
+@@ -39,9 +39,6 @@ version = "1.0.1"
[dev-dependencies.doc-comment]
version = "0.3"
--[target."cfg(windows)".dependencies.winapi]
--version = "0.3"
--features = ["std", "winnt"]
-[target."cfg(windows)".dependencies.winapi-util]
-version = "0.1.1"
+-
[badges.appveyor]
repository = "BurntSushi/walkdir"
-Index: rust/vendor/yansi-term/Cargo.toml
-===================================================================
---- rust.orig/vendor/yansi-term/Cargo.toml
-+++ rust/vendor/yansi-term/Cargo.toml
+diff --git a/vendor/yansi-term/Cargo.toml b/vendor/yansi-term/Cargo.toml
+index 0317866..88ce8ef 100644
+--- a/vendor/yansi-term/Cargo.toml
++++ b/vendor/yansi-term/Cargo.toml
@@ -36,9 +36,6 @@ version = "1.0"
[features]
@@ -815,30 +843,3 @@ Index: rust/vendor/yansi-term/Cargo.toml
[badges.maintenance]
status = "actively-developed"
-Index: rust/vendor/snapbox/Cargo.toml
-===================================================================
---- rust.orig/vendor/snapbox/Cargo.toml
-+++ rust/vendor/snapbox/Cargo.toml
-@@ -154,14 +154,6 @@ optional = true
- version = "2.3.2"
- optional = true
-
--[dependencies.winapi]
--version = "0.3.9"
--features = [
-- "consoleapi",
-- "minwindef",
--]
--optional = true
--
- [dependencies.yansi]
- version = "0.5.0"
- optional = true
-@@ -171,7 +163,6 @@ cmd = [
- "dep:os_pipe",
- "dep:wait-timeout",
- "dep:libc",
-- "dep:winapi",
- ]
- color = [
- "dep:yansi",
diff --git a/debian/patches/d-armel-fix-lldb.patch b/debian/patches/d-armel-fix-lldb.patch
index 4f7ac94b2..2d542a1e9 100644
--- a/debian/patches/d-armel-fix-lldb.patch
+++ b/debian/patches/d-armel-fix-lldb.patch
@@ -4,7 +4,7 @@ Index: rust/src/bootstrap/test.rs
===================================================================
--- rust.orig/src/bootstrap/test.rs
+++ rust/src/bootstrap/test.rs
-@@ -1619,7 +1619,11 @@ note: if you're sure you want to do this
+@@ -1516,7 +1516,11 @@ note: if you're sure you want to do this
.ok();
if let Some(ref vers) = lldb_version {
cmd.arg("--lldb-version").arg(vers);
diff --git a/debian/patches/d-bootstrap-cargo-check-cfg.patch b/debian/patches/d-bootstrap-cargo-check-cfg.patch
index 65fbd07bc..b7e3c457b 100644
--- a/debian/patches/d-bootstrap-cargo-check-cfg.patch
+++ b/debian/patches/d-bootstrap-cargo-check-cfg.patch
@@ -5,7 +5,7 @@ Index: rust/src/bootstrap/builder.rs
===================================================================
--- rust.orig/src/bootstrap/builder.rs
+++ rust/src/bootstrap/builder.rs
-@@ -1350,9 +1350,9 @@ impl<'a> Builder<'a> {
+@@ -1382,9 +1382,9 @@ impl<'a> Builder<'a> {
// complete list of features, so for that reason we don't enable checking of
// features for std crates.
cargo.arg(if mode != Mode::Std {
diff --git a/debian/patches/d-bootstrap-cargo-doc-paths.patch b/debian/patches/d-bootstrap-cargo-doc-paths.patch
index 577bb704e..248dc118c 100644
--- a/debian/patches/d-bootstrap-cargo-doc-paths.patch
+++ b/debian/patches/d-bootstrap-cargo-doc-paths.patch
@@ -29,8 +29,8 @@ Index: rust/src/doc/edition-guide/src/editions/advanced-migrations.md
-[`cargo check`]: ../../cargo/commands/cargo-check.html
-[`cargo fix`]: ../../cargo/commands/cargo-fix.html
-+[`cargo check`]: ../../../cargo-doc/doc/commands/cargo-check.html
-+[`cargo fix`]: ../../../cargo-doc/doc/commands/cargo-fix.html
++[`cargo check`]: ../../../../cargo/book/commands/cargo-check.html
++[`cargo fix`]: ../../../../cargo/book/commands/cargo-fix.html
[`explicit-outlives-requirements`]: ../../rustc/lints/listing/allowed-by-default.html#explicit-outlives-requirements
[`keyword-idents`]: ../../rustc/lints/listing/allowed-by-default.html#keyword-idents
[`rustfix`]: https://github.com/rust-lang/rustfix
@@ -39,13 +39,13 @@ Index: rust/src/doc/edition-guide/src/editions/advanced-migrations.md
-[Cargo package]: ../../cargo/reference/manifest.html#the-package-section
-[Cargo targets]: ../../cargo/reference/cargo-targets.html
-[Cargo workspace]: ../../cargo/reference/workspaces.html
-+[Cargo features]: ../../../cargo-doc/doc/reference/features.html
-+[Cargo package]: ../../../cargo-doc/doc/reference/manifest.html#the-package-section
-+[Cargo targets]: ../../../cargo-doc/doc/reference/cargo-targets.html
-+[Cargo workspace]: ../../../cargo-doc/doc/reference/workspaces.html
++[Cargo features]: ../../../../cargo/book/reference/features.html
++[Cargo package]: ../../../../cargo/book/reference/manifest.html#the-package-section
++[Cargo targets]: ../../../../cargo/book/reference/cargo-targets.html
++[Cargo workspace]: ../../../../cargo/book/reference/workspaces.html
[CLI flag]: ../../rustc/lints/levels.html#via-compiler-flag
-[Code generation]: ../../cargo/reference/build-script-examples.html#code-generation
-+[Code generation]: ../../../cargo-doc/doc/reference/build-script-examples.html#code-generation
++[Code generation]: ../../../../cargo/book/reference/build-script-examples.html#code-generation
[conditional compilation]: ../../reference/conditional-compilation.html
[documentation tests]: ../../rustdoc/documentation-tests.html
[JSON messages]: ../../rustc/json.html
@@ -59,8 +59,8 @@ Index: rust/src/doc/edition-guide/src/editions/transitioning-an-existing-project
-[`cargo fix`]: ../../cargo/commands/cargo-fix.html
-[`cargo test`]: ../../cargo/commands/cargo-test.html
-+[`cargo fix`]: ../../../cargo-doc/doc/commands/cargo-fix.html
-+[`cargo test`]: ../../../cargo-doc/doc/commands/cargo-test.html
++[`cargo fix`]: ../../../../cargo/book/commands/cargo-fix.html
++[`cargo test`]: ../../../../cargo/book/commands/cargo-test.html
[Advanced migration strategies]: advanced-migrations.md
[nightly channel]: ../../book/appendix-07-nightly-rust.html
Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md
@@ -72,14 +72,14 @@ Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md
See [the announcement of Rust 1.51][5] for details.
-[4]: ../../cargo/reference/resolver.html#feature-resolver-version-2
-+[4]: ../../../cargo-doc/doc/reference/resolver.html#feature-resolver-version-2
++[4]: ../../../../cargo/book/reference/resolver.html#feature-resolver-version-2
[5]: https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html#cargos-new-feature-resolver
-[workspace]: ../../cargo/reference/workspaces.html
-[virtual workspace]: ../../cargo/reference/workspaces.html#virtual-manifest
-[`resolver` field]: ../../cargo/reference/resolver.html#resolver-versions
-+[workspace]: ../../../cargo-doc/doc/reference/workspaces.html
-+[virtual workspace]: ../../../cargo-doc/doc/reference/workspaces.html#virtual-manifest
-+[`resolver` field]: ../../../cargo-doc/doc/reference/resolver.html#resolver-versions
++[workspace]: ../../../../cargo/book/reference/workspaces.html
++[virtual workspace]: ../../../../cargo/book/reference/workspaces.html#virtual-manifest
++[`resolver` field]: ../../../../cargo/book/reference/resolver.html#resolver-versions
## Migration
@@ -88,7 +88,7 @@ Index: rust/src/doc/edition-guide/src/rust-2021/default-cargo-resolver.md
We can further see that `bstr`'s "default" feature enables "unicode" (among other features).
-[`cargo tree`]: ../../cargo/commands/cargo-tree.html
-+[`cargo tree`]: ../../../cargo-doc/doc/commands/cargo-tree.html
++[`cargo tree`]: ../../../../cargo/book/commands/cargo-tree.html
Index: rust/src/doc/index.md
===================================================================
--- rust.orig/src/doc/index.md
@@ -98,7 +98,7 @@ Index: rust/src/doc/index.md
### The Cargo Book
-[The Cargo Book](cargo/index.html) is a guide to Cargo, Rust's build tool and
-+[The Cargo Book](../../cargo-doc/doc/index.html) is a guide to Cargo, Rust's build tool and
++[The Cargo Book](../../cargo/book/index.html) is a guide to Cargo, Rust's build tool and
dependency manager.
### The Rustdoc Book
@@ -111,7 +111,7 @@ Index: rust/src/doc/reference/src/conditional-compilation.md
[attribute]: attributes.md
[attributes]: attributes.md
-[cargo-feature]: ../cargo/reference/features.html
-+[cargo-feature]: ../../cargo-doc/doc/reference/features.html
++[cargo-feature]: ../../../cargo/book/reference/features.html
[crate type]: linkage.md
[static C runtime]: linkage.md#static-and-dynamic-c-runtimes
Index: rust/src/doc/reference/src/introduction.md
@@ -124,8 +124,8 @@ Index: rust/src/doc/reference/src/introduction.md
[_Expression_]: expressions.md
-[cargo book]: ../cargo/index.html
-[cargo reference]: ../cargo/reference/index.html
-+[cargo book]: ../../cargo-doc/doc/index.html
-+[cargo reference]: ../../cargo-doc/doc/reference/index.html
++[cargo book]: ../../../cargo/book/index.html
++[cargo reference]: ../../../cargo/book/reference/index.html
[expressions chapter]: expressions.html
[file an issue]: https://github.com/rust-lang/reference/issues
[lifetime of temporaries]: expressions.html#temporaries
@@ -138,7 +138,7 @@ Index: rust/src/doc/reference/src/linkage.md
```
-[cargo]: ../cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts
-+[cargo]: ../../cargo-doc/doc/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts
++[cargo]: ../../../cargo/book/reference/environment-variables.html#environment-variables-cargo-sets-for-build-scripts
To use this feature locally, you typically will use the `RUSTFLAGS` environment
variable to specify flags to the compiler through Cargo. For example to compile
@@ -151,7 +151,7 @@ Index: rust/src/doc/reference/src/procedural-macros.md
[Attribute macros]: #attribute-macros
-[Cargo's build scripts]: ../cargo/reference/build-scripts.html
-+[Cargo's build scripts]: ../../cargo-doc/doc/reference/build-scripts.html
++[Cargo's build scripts]: ../../../cargo/book/reference/build-scripts.html
[Derive macros]: #derive-macros
[Function-like macros]: #function-like-procedural-macros
[`Delimiter::None`]: ../proc_macro/enum.Delimiter.html#variant.None
@@ -164,7 +164,7 @@ Index: rust/src/doc/rustc/src/tests/index.md
[`-Z panic-abort-tests`]: https://github.com/rust-lang/rust/issues/67650
[`available_parallelism`]: ../../std/thread/fn.available_parallelism.html
-[`cargo test`]: ../../cargo/commands/cargo-test.html
-+[`cargo test`]: ../../../cargo-doc/doc/commands/cargo-test.html
++[`cargo test`]: ../../../../cargo/book/commands/cargo-test.html
[`libtest`]: ../../test/index.html
[`main` function]: ../../reference/crates-and-source-files.html#main-functions
[`Result`]: ../../std/result/index.html
@@ -173,7 +173,7 @@ Index: rust/src/doc/rustc/src/tests/index.md
[attribute-test]: ../../reference/attributes/testing.html#the-test-attribute
[bench-docs]: ../../unstable-book/library-features/test.html
-[Cargo]: ../../cargo/index.html
-+[Cargo]: ../../../cargo-doc/doc/index.html
++[Cargo]: ../../../../cargo/book/index.html
[crate type]: ../../reference/linkage.html
[custom_test_frameworks documentation]: ../../unstable-book/language-features/custom-test-frameworks.html
[nightly channel]: ../../book/appendix-07-nightly-rust.html
@@ -186,7 +186,7 @@ Index: rust/src/doc/rustc/src/what-is-rustc.md
Most Rust programmers don't invoke `rustc` directly, but instead do it through
-[Cargo](../cargo/index.html). It's all in service of `rustc` though! If you
-+[Cargo](../../cargo-doc/doc/index.html). It's all in service of `rustc` though! If you
++[Cargo](../../../cargo/book/index.html). It's all in service of `rustc` though! If you
want to see how Cargo calls `rustc`, you can
```bash
@@ -201,20 +201,20 @@ Index: rust/src/doc/edition-guide/book.toml
-"/rust-2018/cargo-and-crates-io/index.html" = "../../../cargo/index.html"
-"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../cargo/commands/cargo-check.html"
-"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../cargo/commands/cargo-install.html"
-+"/rust-2018/cargo-and-crates-io/index.html" = "../../../../cargo-doc/doc/index.html"
-+"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../../cargo-doc/doc/commands/cargo-check.html"
-+"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../../cargo-doc/doc/commands/cargo-install.html"
++"/rust-2018/cargo-and-crates-io/index.html" = "../../../../../cargo/book/index.html"
++"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../../../cargo/book/commands/cargo-check.html"
++"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../../../cargo/book/commands/cargo-install.html"
"/rust-2018/cargo-and-crates-io/cargo-new-defaults-to-a-binary-project.html" = "https://blog.rust-lang.org/2018/03/29/Rust-1.25.html#cargo-features"
-"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../cargo/commands/cargo-rustc.html"
-"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../cargo/reference/workspaces.html"
-"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../cargo/guide/project-layout.html"
-"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../cargo/reference/overriding-dependencies.html#the-patch-section"
-"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../cargo/reference/source-replacement.html"
-+"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../../cargo-doc/doc/commands/cargo-rustc.html"
-+"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../../cargo-doc/doc/reference/workspaces.html"
-+"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../../cargo-doc/doc/guide/project-layout.html"
-+"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../../cargo-doc/doc/reference/overriding-dependencies.html#the-patch-section"
-+"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../../cargo-doc/doc/reference/source-replacement.html"
++"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../../../cargo/book/commands/cargo-rustc.html"
++"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../../../cargo/book/reference/workspaces.html"
++"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../../../cargo/book/guide/project-layout.html"
++"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../../../cargo/book/reference/overriding-dependencies.html#the-patch-section"
++"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../../../cargo/book/reference/source-replacement.html"
"/rust-2018/cargo-and-crates-io/crates-io-disallows-wildcard-dependencies.html" = "https://blog.rust-lang.org/2016/01/21/Rust-1.6.html#cratesio-disallows-wildcards"
"/rust-2018/documentation/index.html" = "../../../index.html"
"/rust-2018/documentation/new-editions-of-the-book.html" = "../../../book/index.html"
@@ -223,20 +223,18 @@ Index: rust/src/doc/edition-guide/book.toml
"/rust-next/alloc.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#the-alloc-crate-is-stable"
"/rust-next/maybe-uninit.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#maybeuninitt-instead-of-memuninitialized"
-"/rust-next/cargo-vendor.html" = "../../cargo/commands/cargo-vendor.html"
-+"/rust-next/cargo-vendor.html" = "../../../cargo-doc/doc/commands/cargo-vendor.html"
++"/rust-next/cargo-vendor.html" = "../../../../cargo/book/commands/cargo-vendor.html"
Index: rust/src/tools/linkchecker/main.rs
===================================================================
--- rust.orig/src/tools/linkchecker/main.rs
+++ rust/src/tools/linkchecker/main.rs
-@@ -262,6 +262,12 @@ impl Checker {
+@@ -262,6 +262,10 @@ impl Checker {
return;
}
}
-+ if let Some(path_str) = path.to_str() {
-+ if path_str.contains("/cargo-doc/doc/") {
-+ // link to related cargo-doc, ok for our Debian build
-+ return;
-+ }
++ if url.contains("../../cargo/book/") {
++ // link to related cargo-doc, ok for our Debian build
++ return;
+ }
if is_exception(file, &target_pretty_path) {
report.links_ignored_exception += 1;
@@ -250,7 +248,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0462.md
This error can be fixed by:
- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically
-+ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically
++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically
fixing this issue.
* Recompiling the crate as a `rlib` or `dylib`; formats suitable for Rust
linking.
@@ -263,7 +261,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0460.md
version to depend on.
-[Cargo]: ../cargo/index.html
-+[Cargo]: ../../cargo-doc/doc/index.html
++[Cargo]: ../../../cargo/book/index.html
Index: rust/compiler/rustc_error_codes/src/error_codes/E0514.md
===================================================================
--- rust.orig/compiler/rustc_error_codes/src/error_codes/E0514.md
@@ -273,7 +271,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0514.md
This error can be fixed by:
- * Using [Cargo](../cargo/index.html), the Rust package manager and
-+ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager and
++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager and
[Rustup](https://rust-lang.github.io/rustup/), the Rust toolchain installer,
automatically fixing this issue.
* Recompiling the crates with a uniform `rustc` version.
@@ -286,7 +284,7 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/branch-protection.md
Rust's standard library does not ship with BTI or pointer authentication enabled by default.
In Cargo projects the standard library can be recompiled with pointer authentication using the nightly
-[build-std](../../cargo/reference/unstable.html#build-std) feature.
-+[build-std](../../../cargo-doc/doc/reference/unstable.html#build-std) feature.
++[build-std](../../../../cargo/book/reference/unstable.html#build-std) feature.
Index: rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
===================================================================
--- rust.orig/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
@@ -296,7 +294,7 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/control-flow-guard.md
To enable CFG in the standard library, use the [cargo `-Z build-std` functionality][build-std] to recompile the standard library with the same configuration options as the main program.
-[build-std]: ../../cargo/reference/unstable.html#build-std
-+[build-std]: ../../../cargo-doc/doc/reference/unstable.html#build-std
++[build-std]: ../../../../cargo/book/reference/unstable.html#build-std
For example:
```cmd
@@ -304,12 +302,12 @@ Index: rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md
===================================================================
--- rust.orig/src/doc/unstable-book/src/compiler-flags/sanitizer.md
+++ rust/src/doc/unstable-book/src/compiler-flags/sanitizer.md
-@@ -709,7 +709,7 @@ It is strongly recommended to combine sa
+@@ -793,7 +793,7 @@ It is strongly recommended to combine sa
instrumented standard library, for example using [cargo `-Zbuild-std`
functionality][build-std].
-[build-std]: ../../cargo/reference/unstable.html#build-std
-+[build-std]: ../../../cargo-doc/doc/reference/unstable.html#build-std
++[build-std]: ../../../../cargo/book/reference/unstable.html#build-std
# Build scripts and procedural macros
@@ -322,7 +320,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0461.md
This error can be fixed by:
- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically
-+ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically
++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically
fixing this issue.
* Recompiling either crate so that they target a consistent target triple.
Index: rust/compiler/rustc_error_codes/src/error_codes/E0519.md
@@ -334,7 +332,7 @@ Index: rust/compiler/rustc_error_codes/src/error_codes/E0519.md
This error can be fixed by:
- * Using [Cargo](../cargo/index.html), the Rust package manager, automatically
-+ * Using [Cargo](../../cargo-doc/doc/index.html), the Rust package manager, automatically
++ * Using [Cargo](../../../cargo/book/index.html), the Rust package manager, automatically
fixing this issue.
* Recompiling the crate with different metadata (different name/
`crate_type`).
@@ -347,7 +345,7 @@ Index: rust/src/doc/rustc/src/linker-plugin-lto.md
`cargo build --target x86_64-pc-windows-msvc`
Without an explicit --target the flags will be passed to all compiler invocations (including build
-scripts and proc macros), see [cargo docs on rustflags](../cargo/reference/config.html#buildrustflags)
-+scripts and proc macros), see [cargo docs on rustflags](../../cargo-doc/doc/reference/config.html#buildrustflags)
++scripts and proc macros), see [cargo docs on rustflags](../../../cargo/book/reference/config.html#buildrustflags)
If you have dependencies using the `cc` crate, you will need to set these
environment variables:
@@ -360,7 +358,7 @@ Index: rust/src/doc/rustc/src/platform-support/fuchsia.md
[source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build
[rustup]: https://rustup.rs/
-[cargo]: ../../cargo/index.html
-+[cargo]: ../../../cargo-doc/doc/index.html
++[cargo]: ../../../../cargo/book/index.html
[Fuchsia SDK]: https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
[overview of CML]: https://fuchsia.dev/fuchsia-src/concepts/components/v2/component_manifests
[reference for the file format]: https://fuchsia.dev/reference/cml
@@ -373,4 +371,4 @@ Index: rust/src/doc/rustc/src/targets/custom.md
```
-To use a custom target, see the (unstable) [`build-std` feature](../../cargo/reference/unstable.html#build-std) of `cargo`.
-+To use a custom target, see the (unstable) [`build-std` feature](../../../cargo-doc/doc/reference/unstable.html#build-std) of `cargo`.
++To use a custom target, see the (unstable) [`build-std` feature](../../../../cargo/book/reference/unstable.html#build-std) of `cargo`.
diff --git a/debian/patches/d-bootstrap-custom-debuginfo-path.patch b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
index 156ac4e13..e4a833155 100644
--- a/debian/patches/d-bootstrap-custom-debuginfo-path.patch
+++ b/debian/patches/d-bootstrap-custom-debuginfo-path.patch
@@ -12,7 +12,7 @@ Index: rust/src/bootstrap/lib.rs
===================================================================
--- rust.orig/src/bootstrap/lib.rs
+++ rust/src/bootstrap/lib.rs
-@@ -1011,10 +1011,9 @@ impl Build {
+@@ -1091,10 +1091,9 @@ impl Build {
match which {
GitRepo::Rustc => {
diff --git a/debian/patches/d-bootstrap-disable-git.patch b/debian/patches/d-bootstrap-disable-git.patch
index d7618adfe..4cd8bc1cd 100644
--- a/debian/patches/d-bootstrap-disable-git.patch
+++ b/debian/patches/d-bootstrap-disable-git.patch
@@ -31,7 +31,7 @@ Index: rust/src/bootstrap/dist.rs
===================================================================
--- rust.orig/src/bootstrap/dist.rs
+++ rust/src/bootstrap/dist.rs
-@@ -995,7 +995,10 @@ impl Step for PlainSourceTarball {
+@@ -997,7 +997,10 @@ impl Step for PlainSourceTarball {
}
// If we're building from git sources, we need to vendor a complete distribution.
@@ -41,5 +41,5 @@ Index: rust/src/bootstrap/dist.rs
+ // repository, but cargo-vendor should not be installed or run.
+ if false && builder.rust_info().is_managed_git_subrepository() {
// Ensure we have the submodules checked out.
+ builder.update_submodule(Path::new("src/tools/cargo"));
builder.update_submodule(Path::new("src/tools/rust-analyzer"));
-
diff --git a/debian/patches/d-bootstrap-no-assume-tools.patch b/debian/patches/d-bootstrap-no-assume-tools.patch
index 9747f9ede..c9d066619 100644
--- a/debian/patches/d-bootstrap-no-assume-tools.patch
+++ b/debian/patches/d-bootstrap-no-assume-tools.patch
@@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder/tests.rs
===================================================================
--- rust.orig/src/bootstrap/builder/tests.rs
+++ rust/src/bootstrap/builder/tests.rs
-@@ -364,9 +364,13 @@ mod dist {
+@@ -380,9 +380,13 @@ mod dist {
#[test]
fn dist_only_cross_host() {
let b = TargetSelection::from_user("B");
diff --git a/debian/patches/d-bootstrap-read-beta-version-from-file.patch b/debian/patches/d-bootstrap-read-beta-version-from-file.patch
deleted file mode 100644
index 871110cca..000000000
--- a/debian/patches/d-bootstrap-read-beta-version-from-file.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:38 +0200
-Subject: d-bootstrap-read-beta-version-from-file
-
-===================================================================
----
- src/bootstrap/lib.rs | 14 ++++++--------
- 1 file changed, 6 insertions(+), 8 deletions(-)
-
-Index: rust/src/bootstrap/lib.rs
-===================================================================
---- rust.orig/src/bootstrap/lib.rs
-+++ rust/src/bootstrap/lib.rs
-@@ -1264,14 +1264,15 @@ impl Build {
- return s;
- }
-
-- // Figure out how many merge commits happened since we branched off master.
-- // That's our beta number!
-- // (Note that we use a `..` range, not the `...` symmetric difference.)
-- let count =
-- output(self.config.git().arg("rev-list").arg("--count").arg("--merges").arg(format!(
-- "refs/remotes/origin/{}..HEAD",
-- self.config.stage0_metadata.config.nightly_branch
-- )));
-+ // Debian: read beta number from "version" file, this is only available
-+ // in the rustc upstream tarballs and not their git
-+ let count = output(
-+ Command::new("sed")
-+ .arg("-re")
-+ .arg(r"s/[0-9]+.[0-9]+.[0-9]+-beta.([0-9]+) \(.*\)/\1/g")
-+ .arg("version")
-+ .current_dir(&self.src),
-+ );
- let n = count.trim().parse().unwrap();
- self.prerelease_version.set(Some(n));
- n
diff --git a/debian/patches/d-bootstrap-rustflags.patch b/debian/patches/d-bootstrap-rustflags.patch
index 017325e06..30e826d81 100644
--- a/debian/patches/d-bootstrap-rustflags.patch
+++ b/debian/patches/d-bootstrap-rustflags.patch
@@ -11,7 +11,7 @@ Index: rust/src/bootstrap/builder.rs
===================================================================
--- rust.orig/src/bootstrap/builder.rs
+++ rust/src/bootstrap/builder.rs
-@@ -1377,6 +1377,18 @@ impl<'a> Builder<'a> {
+@@ -1409,6 +1409,18 @@ impl<'a> Builder<'a> {
}
}
diff --git a/debian/patches/d-disable-download-tests.patch b/debian/patches/d-disable-download-tests.patch
index 41531a87f..3f4b1dbe6 100644
--- a/debian/patches/d-disable-download-tests.patch
+++ b/debian/patches/d-disable-download-tests.patch
@@ -2,7 +2,7 @@ Index: rust/src/bootstrap/config/tests.rs
===================================================================
--- rust.orig/src/bootstrap/config/tests.rs
+++ rust/src/bootstrap/config/tests.rs
-@@ -11,6 +11,9 @@ fn parse(config: &str) -> Config {
+@@ -10,6 +10,9 @@ fn parse(config: &str) -> Config {
#[test]
fn download_ci_llvm() {
@@ -12,7 +12,7 @@ Index: rust/src/bootstrap/config/tests.rs
if crate::llvm::is_ci_llvm_modified(&parse("")) {
eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
return;
-@@ -39,7 +42,11 @@ fn download_ci_llvm() {
+@@ -38,7 +41,11 @@ fn download_ci_llvm() {
// - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487
#[test]
fn detect_src_and_out() {
diff --git a/debian/patches/d-fix-rustix-outline.patch b/debian/patches/d-fix-rustix-outline.patch
index 52e152da1..99fd7e958 100644
--- a/debian/patches/d-fix-rustix-outline.patch
+++ b/debian/patches/d-fix-rustix-outline.patch
@@ -12,7 +12,7 @@ Index: rust/vendor/rustix/build.rs
use cc::Build;
use std::env::var;
use std::io::Write;
-@@ -158,16 +157,16 @@ fn link_in_librustix_outline(arch: &str,
+@@ -162,16 +161,16 @@ fn link_in_librustix_outline(arch: &str,
println!("cargo:rerun-if-changed={}", to);
// If "cc" is not enabled, use a pre-built library.
diff --git a/debian/patches/d-rustc-add-soname.patch b/debian/patches/d-rustc-add-soname.patch
index 1026b26b2..03dc0ba6d 100644
--- a/debian/patches/d-rustc-add-soname.patch
+++ b/debian/patches/d-rustc-add-soname.patch
@@ -28,7 +28,7 @@ Index: rust/compiler/rustc_codegen_ssa/src/back/link.rs
===================================================================
--- rust.orig/compiler/rustc_codegen_ssa/src/back/link.rs
+++ rust/compiler/rustc_codegen_ssa/src/back/link.rs
-@@ -2216,6 +2216,13 @@ fn add_order_independent_options(
+@@ -2359,6 +2359,13 @@ fn add_order_independent_options(
}
add_rpath_args(cmd, sess, codegen_results, out_filename);
diff --git a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
index 3d2d8ff59..faee1685e 100644
--- a/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
+++ b/debian/patches/d-rustc-fix-mips64el-bootstrap.patch
@@ -42,7 +42,7 @@ Index: rust/src/bootstrap/bootstrap.py
===================================================================
--- rust.orig/src/bootstrap/bootstrap.py
+++ rust/src/bootstrap/bootstrap.py
-@@ -759,6 +759,8 @@ class RustBuild(object):
+@@ -877,6 +877,8 @@ class RustBuild(object):
# preserve existing RUSTFLAGS
env.setdefault("RUSTFLAGS", "")
diff --git a/debian/patches/series b/debian/patches/series
index 2f6094730..95572141b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,11 +15,11 @@ u-fix-get-toml-when-test.patch
u-disable-fp-precision-test-on-i386.patch
u-riscv-disable-unpacked-split-debuginfo.patch
u-profiler.patch
+u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
# not forwarded, or forwarded but unlikely to be merged
u-ignore-ppc-hangs.patch
u-rustc-llvm-cross-flags.patch
-u-reproducible-dl-stage0.patch
#u-allow-system-compiler-rt.patch
# Debian-specific patches, not suitable for upstream
@@ -44,7 +44,6 @@ d-bootstrap-rustflags.patch
d-remove-arm-privacy-breaches.patch
d-bootstrap-install-symlinks.patch
d-bootstrap-disable-git.patch
-d-bootstrap-read-beta-version-from-file.patch
d-bootstrap-no-assume-tools.patch
d-bootstrap-cargo-doc-paths.patch
d-bootstrap-use-local-css.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
new file mode 100644
index 000000000..b49347990
--- /dev/null
+++ b/debian/patches/u-avoid-blessing-cargo-deps-s-source-code-in-ui-tests.patch
@@ -0,0 +1,40 @@
+From c230637b92a3101a5b18141b75f94ada2edee776 Mon Sep 17 00:00:00 2001
+From: Pietro Albini <pietro.albini@ferrous-systems.com>
+Date: Fri, 15 Sep 2023 16:09:45 +0200
+Subject: [PATCH] avoid blessing cargo deps's source code in ui tests
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+FG: just the stderr part for now, the rest needs a newer cargo
+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
++++ rust/tests/ui/issues/issue-21763.rs
+@@ -1,6 +1,6 @@
+ // Regression test for HashMap only impl'ing Send/Sync if its contents do
+
+-// normalize-stderr-test: "\S+hashbrown-\S+" -> "$$HASHBROWN_SRC_LOCATION"
++// normalize-stderr-test: "\S+[\\/]hashbrown\S+" -> "$$HASHBROWN_SRC_LOCATION"
+
+ use std::collections::HashMap;
+ use std::rc::Rc;
diff --git a/debian/patches/u-fix-get-toml-when-test.patch b/debian/patches/u-fix-get-toml-when-test.patch
index 34789ecae..4b5bcb6d5 100644
--- a/debian/patches/u-fix-get-toml-when-test.patch
+++ b/debian/patches/u-fix-get-toml-when-test.patch
@@ -10,32 +10,27 @@ Index: rust/src/bootstrap/config.rs
===================================================================
--- rust.orig/src/bootstrap/config.rs
+++ rust/src/bootstrap/config.rs
-@@ -848,9 +848,9 @@ impl Config {
- }
+@@ -931,9 +931,32 @@ impl Config {
pub fn parse(args: &[String]) -> Config {
-- #[cfg(test)]
-+ /*#[cfg(test)]
- let get_toml = |_: &_| TomlConfig::default();
-- #[cfg(not(test))]
-+ #[cfg(not(test))]*/
- let get_toml = |file: &Path| {
- let contents =
- t!(fs::read_to_string(file), format!("config file {} not found", file.display()));
-@@ -859,7 +859,23 @@ impl Config {
- match toml::from_str(&contents)
- .and_then(|table: toml::Value| TomlConfig::deserialize(table))
- {
-- Ok(table) => table,
-+ // Debian: We use previous version as a custom rustc, which
-+ // unfortunately won't be picked up because config.toml isn't
-+ // read when cfg!(test). Making tests use the entirety of our
-+ // config.toml isn't feasible either as it panicks on
-+ // GitRepo::Llvm (d-bootstrap-custom-debuginfo-path.patch), so
-+ // only give paths of initial rustc and cargo.
-+ Ok(table) => if !cfg!(test) || table.build.is_none() {
-+ table
-+ } else {
+ #[cfg(test)]
+- fn get_toml(_: &Path) -> TomlConfig {
+- TomlConfig::default()
+- }
++ fn get_toml(file: &Path) -> TomlConfig {
++ // Debian: We use previous version as a custom rustc, which
++ // unfortunately won't be picked up because config.toml isn't
++ // read when cfg!(test). Making tests use the entirety of our
++ // config.toml isn't feasible either as it panicks on
++ // GitRepo::Llvm (d-bootstrap-custom-debuginfo-path.patch), so
++ // only give paths of initial rustc and cargo.
++ let contents =
++ t!(fs::read_to_string(file), format!("config file {} not found", file.display()));
++ // Deserialize to Value and then TomlConfig to prevent the Deserialize impl of
++ // TomlConfig and sub types to be monomorphized 5x by toml.
++ toml::from_str(&contents)
++ .and_then(|table: toml::Value| TomlConfig::deserialize(table))
++ .map(|table| {
+ let mut config = TomlConfig::default();
+ let mut build = Build::default();
+ let cbuild = table.build.unwrap();
@@ -43,7 +38,11 @@ Index: rust/src/bootstrap/config.rs
+ build.cargo = cbuild.cargo;
+ config.build = Some(build);
+ config
-+ },
- Err(err) => {
- eprintln!("failed to parse TOML configuration '{}': {}", file.display(), err);
- crate::detail_exit(2);
++ })
++ .unwrap_or_else(|err| {
++ eprintln!("failed to parse TOML configuration '{}': {err}", file.display());
++ crate::detail_exit(2);
++ }) }
+
+ #[cfg(not(test))]
+ fn get_toml(file: &Path) -> TomlConfig {
diff --git a/debian/patches/u-profiler.patch b/debian/patches/u-profiler.patch
index 37f63af69..f83e4fcbc 100644
--- a/debian/patches/u-profiler.patch
+++ b/debian/patches/u-profiler.patch
@@ -46,7 +46,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
--- a/src/bootstrap/compile.rs
+++ b/src/bootstrap/compile.rs
-@@ -314,6 +314,10 @@ pub fn std_cargo(builder: &Builder<'_>,
+@@ -305,6 +305,10 @@ pub fn std_cargo(builder: &Builder<'_>,
cargo.env("MACOSX_DEPLOYMENT_TARGET", target);
}
@@ -59,16 +59,16 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
// `compiler-rt` repository, but our `src/llvm-project` submodule isn't
--- a/src/bootstrap/config.rs
+++ b/src/bootstrap/config.rs
-@@ -454,7 +454,7 @@ pub struct Target {
+@@ -467,7 +467,7 @@ pub struct Target {
pub linker: Option<PathBuf>,
pub ndk: Option<PathBuf>,
pub sanitizers: Option<bool>,
- pub profiler: Option<bool>,
+ pub profiler: Option<StringOrBool>,
+ pub rpath: Option<bool>,
pub crt_static: Option<bool>,
pub musl_root: Option<PathBuf>,
- pub musl_libdir: Option<PathBuf>,
-@@ -715,9 +715,9 @@ define_config! {
+@@ -796,9 +796,9 @@ define_config! {
}
}
@@ -80,7 +80,7 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
String(String),
Bool(bool),
}
-@@ -728,6 +728,12 @@ impl Default for StringOrBool {
+@@ -809,6 +809,12 @@ impl Default for StringOrBool {
}
}
@@ -93,16 +93,16 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
define_config! {
/// TOML representation of how the Rust build is configured.
struct Rust {
-@@ -799,7 +805,7 @@ define_config! {
+@@ -880,7 +886,7 @@ define_config! {
llvm_libunwind: Option<String> = "llvm-libunwind",
android_ndk: Option<String> = "android-ndk",
sanitizers: Option<bool> = "sanitizers",
- profiler: Option<bool> = "profiler",
+ profiler: Option<StringOrBool> = "profiler",
+ rpath: Option<bool> = "rpath",
crt_static: Option<bool> = "crt-static",
musl_root: Option<String> = "musl-root",
- musl_libdir: Option<String> = "musl-libdir",
-@@ -1616,12 +1622,24 @@ impl Config {
+@@ -1744,12 +1750,24 @@ impl Config {
self.target_config.values().any(|t| t.sanitizers == Some(true)) || self.sanitizers
}
@@ -128,4 +128,4 @@ reads that in a `LLVM_PROFILER_RT_LIB` environment variable.
+ || self.profiler
}
- pub fn llvm_enabled(&self) -> bool {
+ pub fn rpath_enabled(&self, target: TargetSelection) -> bool {
diff --git a/debian/patches/u-reproducible-dl-stage0.patch b/debian/patches/u-reproducible-dl-stage0.patch
deleted file mode 100644
index 1d0527d2c..000000000
--- a/debian/patches/u-reproducible-dl-stage0.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Date: Thu, 14 Jul 2022 13:17:37 +0200
-Subject: u-reproducible-dl-stage0
-
-===================================================================
----
- src/bootstrap/bootstrap.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: rust/src/bootstrap/bootstrap.py
-===================================================================
---- rust.orig/src/bootstrap/bootstrap.py
-+++ rust/src/bootstrap/bootstrap.py
-@@ -92,7 +92,7 @@ def _download(path, url, probably_big, v
- "-L", # Follow redirect.
- "-y", "30", "-Y", "10", # timeout if speed is < 10 bytes/sec for > 30 seconds
- "--connect-timeout", "30", # timeout if cannot connect within 30 seconds
-- "--retry", "3", "-Sf", url],
-+ "--retry", "3", "-Sf", "-R", url],
- stdout=outfile, #Implements cli redirect operator '>'
- verbose=verbose,
- exception=True, # Will raise RuntimeError on failure
diff --git a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
index d947a6950..faa70d7fa 100644
--- a/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
+++ b/debian/patches/ubuntu-disable-ppc64el-asm-tests.patch
@@ -2,7 +2,7 @@ Index: rust/compiler/rustc_lint_defs/src/builtin.rs
===================================================================
--- rust.orig/compiler/rustc_lint_defs/src/builtin.rs
+++ rust/compiler/rustc_lint_defs/src/builtin.rs
-@@ -2880,11 +2880,13 @@ declare_lint! {
+@@ -2883,11 +2883,13 @@ declare_lint! {
///
/// use std::arch::asm;
///
@@ -20,7 +20,7 @@ Index: rust/compiler/rustc_lint/src/builtin.rs
===================================================================
--- rust.orig/compiler/rustc_lint/src/builtin.rs
+++ rust/compiler/rustc_lint/src/builtin.rs
-@@ -3110,7 +3110,10 @@ declare_lint! {
+@@ -3102,7 +3102,10 @@ declare_lint! {
/// ### Example
///
/// ```rust,compile_fail