proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2026-01-14 15:28:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

early-stage update of patches for 1.80.0+dfsg1

Browse Source
This commit is contained in:
Fabian Grünbichler 2024-07-26 13:49:24 +02:00
parent 1d264e4204
commit ff72d4a6ef
27 changed files with 1231 additions and 200 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/behaviour/d-rustc-add-soname.patch vendored
View File

@ -25,10 +25,10 @@ Forwarded: no
1 file changed, 7 insertions(+)
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index b458f32..07b7b55 100644
index bdb808b..620b3db 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -2465,6 +2465,13 @@ fn add_order_independent_options(
@@ -2491,6 +2491,13 @@ fn add_order_independent_options(
}
add_rpath_args(cmd, sess, codegen_results, out_filename);

4
debian/patches/behaviour/d-rustc-i686-baseline.patch vendored
View File

@ -42,10 +42,10 @@ index 3a8540a..bc4fea5 100644
}
}
diff --git a/tests/ui/sse2.rs b/tests/ui/sse2.rs
index fa6d797..8822846 100644
index 9ed6f6f..a283a0a 100644
--- a/tests/ui/sse2.rs
+++ b/tests/ui/sse2.rs
@@ -15,7 +15,7 @@ fn main() {
@@ -16,7 +16,7 @@ fn main() {
}
Err(_) => return,
}

6
debian/patches/behaviour/d-rustc-windows-ssp.patch vendored
View File

@ -8,11 +8,11 @@ Bug: https://github.com/rust-lang/rust/issues/68973
1 file changed, 2 insertions(+)
diff --git a/compiler/rustc_target/src/spec/base/windows_gnu.rs b/compiler/rustc_target/src/spec/base/windows_gnu.rs
index 25f02dc..402bb29 100644
index 1357de2..9afee20 100644
--- a/compiler/rustc_target/src/spec/base/windows_gnu.rs
+++ b/compiler/rustc_target/src/spec/base/windows_gnu.rs
@@ -42,6 +42,8 @@ pub fn opts() -> TargetOptions {
"-lmsvcrt",
@@ -45,6 +45,8 @@ pub fn opts() -> TargetOptions {
"-lmingwex",
"-luser32",
"-lkernel32",
+ "-lssp_nonshared",

6
debian/patches/behaviour/d-rustdoc-disable-embedded-fonts.patch vendored
View File

@ -10,7 +10,7 @@ Forwarded: not-needed
2 files changed, 10 deletions(-)
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index 74c9130..a9a1380 100644
index 4c0ba75..9a237be 100644
--- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -86,14 +86,6 @@
@ -29,10 +29,10 @@ index 74c9130..a9a1380 100644
box-sizing: border-box;
}
diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index d8874c2..3d33bae 100644
index 035376b..f4a977c 100644
--- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs
@@ -118,8 +118,6 @@ static_files! {
@@ -116,8 +116,6 @@ static_files! {
source_code_pro_semibold => "static/fonts/SourceCodePro-Semibold.ttf.woff2",
source_code_pro_italic => "static/fonts/SourceCodePro-It.ttf.woff2",
source_code_pro_license => "static/fonts/SourceCodePro-LICENSE.txt",

8
debian/patches/build/d-armel-fix-lldb.patch vendored
View File

@ -8,15 +8,15 @@ Forwarded: no
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 2b8f1d1..bb572db 100644
index 557f71c..acda398 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -1935,7 +1935,11 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
@@ -1893,7 +1893,11 @@ NOTE: if you're sure you want to do this, please open an issue as to why. In the
.ok();
if let Some(ref vers) = lldb_version {
cmd.arg("--lldb-version").arg(vers);
- let lldb_python_dir = run(Command::new(lldb_exe).arg("-P")).ok();
+ let lldb_python_dir = Command::new(lldb_exe)
- let lldb_python_dir = run(Command::new(&lldb_exe).arg("-P")).ok();
+ let lldb_python_dir = Command::new(&lldb_exe)
+ .arg("-P")
+ .output()
+ .map(|output| String::from_utf8_lossy(&output.stdout).to_string())

14
debian/patches/build/d-bootstrap-cargo-doc-paths.patch vendored
View File

@ -212,10 +212,10 @@ index 8ad5b42..f93d3da 100644
### The Rustdoc Book
diff --git a/src/doc/reference/src/conditional-compilation.md b/src/doc/reference/src/conditional-compilation.md
index e245c13..ee5104b 100644
index f83dbfe..578b524 100644
--- a/src/doc/reference/src/conditional-compilation.md
+++ b/src/doc/reference/src/conditional-compilation.md
@@ -392,6 +392,6 @@ println!("I'm running on a {} machine!", machine_kind);
@@ -394,6 +394,6 @@ println!("I'm running on a {} machine!", machine_kind);
[`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute
[attribute]: attributes.md
[attributes]: attributes.md
@ -265,7 +265,7 @@ index 32b847c..0cf09eb 100644
[Function-like macros]: #function-like-procedural-macros
[`Delimiter::None`]: ../proc_macro/enum.Delimiter.html#variant.None
diff --git a/src/doc/rustc/src/linker-plugin-lto.md b/src/doc/rustc/src/linker-plugin-lto.md
index ff80f14..99745bc 100644
index ab95aa2..8023f33 100644
--- a/src/doc/rustc/src/linker-plugin-lto.md
+++ b/src/doc/rustc/src/linker-plugin-lto.md
@@ -112,7 +112,7 @@ targeting Windows-like targets
@ -278,10 +278,10 @@ index ff80f14..99745bc 100644
If you have dependencies using the `cc` crate, you will need to set these
environment variables:
diff --git a/src/doc/rustc/src/platform-support/fuchsia.md b/src/doc/rustc/src/platform-support/fuchsia.md
index 34ab3cd..d3dac67 100644
index 5643c6a..a3458d8 100644
--- a/src/doc/rustc/src/platform-support/fuchsia.md
+++ b/src/doc/rustc/src/platform-support/fuchsia.md
@@ -931,7 +931,7 @@ attach and load any relevant debug symbols.
@@ -940,7 +940,7 @@ attach and load any relevant debug symbols.
[Fuchsia]: https://fuchsia.dev/
[source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build
[rustup]: https://rustup.rs/
@ -372,10 +372,10 @@ index 72b44e0..cfe71b2 100644
# Working with other languages
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index c8ecfd3..e625bc8 100644
index 18ea70c..760d377 100644
--- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs
@@ -288,6 +288,10 @@ impl Checker {
@@ -290,6 +290,10 @@ impl Checker {
return;
}
}

4
debian/patches/build/d-bootstrap-custom-debuginfo-path.patch vendored
View File

@ -10,10 +10,10 @@ Forwarded: not-needed
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index 663a2d8..c3ae768 100644
index cde0906..a08833e 100644
--- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs
@@ -1220,10 +1220,9 @@ impl Build {
@@ -1230,10 +1230,9 @@ impl Build {
match which {
GitRepo::Rustc => {

8
debian/patches/build/d-bootstrap-disable-git.patch vendored
View File

@ -9,10 +9,10 @@ Forwarded: not-needed
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 770a5cd..0b5e333 100644
index 91039d0..f2793e4 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -998,8 +998,10 @@ impl Step for PlainSourceTarball {
@@ -1007,8 +1007,10 @@ impl Step for PlainSourceTarball {
// If we're building from git or tarball sources, we need to vendor
// a complete distribution.
@ -23,8 +23,8 @@ index 770a5cd..0b5e333 100644
+ // repository, but cargo-vendor should not be installed or run.
+ if false
{
// Ensure we have all submodules from src and other directories checked out.
for submodule in builder.get_all_submodules() {
// FIXME: This code looks _very_ similar to what we have in `src/core/build_steps/vendor.rs`
// perhaps it should be removed in favor of making `dist` perform the `vendor` step?
diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs
index 88988c3..e5c6cd1 100644
--- a/src/bootstrap/src/utils/channel.rs

11
debian/patches/build/d-bootstrap-no-assume-tools.patch vendored
View File

@ -9,20 +9,21 @@ Forwarded: not-needed
1 file changed, 4 insertions(+)
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index caec463..9d83cc8f 100644
index 276fd0b..4f5055c 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -387,9 +387,13 @@ mod dist {
@@ -426,10 +426,14 @@ mod dist {
#[test]
fn dist_only_cross_host() {
let b = TargetSelection::from_user("B");
let b = TargetSelection::from_user("B-B");
+ let mut tools = std::collections::HashSet::new();
+ tools.insert("clippy".to_string());
+ tools.insert("rustfmt".to_string());
let mut config = configure(&["A", "B"], &["A", "B"]);
let mut config = configure(&["A-A", "B-B"], &["A-A", "B-B"]);
config.docs = false;
config.extended = true;
+ config.tools = Some(tools);
config.hosts = vec![b];
+ config.tools = Some(tools);
let mut cache = run_build(&[], config);
assert_eq!(

4
debian/patches/build/d-bootstrap-permit-symlink-in-docs.patch vendored
View File

@ -8,10 +8,10 @@ Forwarded: not-needed
1 file changed, 1 insertion(+)
diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 0b5e333..85c5edb 100644
index f2793e4..b1eb562 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -78,6 +78,7 @@ impl Step for Docs {
@@ -80,6 +80,7 @@ impl Step for Docs {
tarball.set_product_name("Rust Documentation");
tarball.add_bulk_dir(&builder.doc_out(host), dest);
tarball.add_file(builder.src.join("src/doc/robots.txt"), dest, 0o644);

4
debian/patches/build/d-bootstrap-rustflags.patch vendored
View File

@ -10,10 +10,10 @@ Forwarded: not-needed
1 file changed, 12 insertions(+)
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
index 19691dd..c4e3dda 100644
index e41070c..3e19547 100644
--- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs
@@ -1556,6 +1556,18 @@ impl<'a> Builder<'a> {
@@ -1561,6 +1561,18 @@ impl<'a> Builder<'a> {
hostflags.arg("-Zunstable-options");
hostflags.arg("--check-cfg=cfg(bootstrap)");

6
debian/patches/build/d-bootstrap-use-local-css.patch vendored
View File

@ -9,10 +9,10 @@ Forwarded: not-needed
1 file changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index 38c48bd..e2fb48b 100644
index b37b2b5..9ad5e81 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -363,7 +363,27 @@ impl Step for Standalone {
@@ -380,7 +380,27 @@ impl Step for Standalone {
.arg("--index-page")
.arg(&builder.src.join("src/doc/index.md"))
.arg("--markdown-playground-url")
@ -41,7 +41,7 @@ index 38c48bd..e2fb48b 100644
.arg("-o")
.arg(&out)
.arg(&path);
@@ -372,11 +392,6 @@ impl Step for Standalone {
@@ -389,11 +409,6 @@ impl Step for Standalone {
cmd.arg("--disable-minification");
}

6
debian/patches/cargo/c-0003-tests-add-missing-cross-disabled-checks.patch vendored
View File

@ -17,10 +17,10 @@ Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
1 file changed, 6 insertions(+)
diff --git a/src/tools/cargo/tests/testsuite/build_script.rs b/src/tools/cargo/tests/testsuite/build_script.rs
index d8fed64..851b5b2 100644
index 1b770cd..93f8131 100644
--- a/src/tools/cargo/tests/testsuite/build_script.rs
+++ b/src/tools/cargo/tests/testsuite/build_script.rs
@@ -741,6 +741,9 @@ fn custom_build_linker_bad_host_with_arch() {
@@ -742,6 +742,9 @@ fn custom_build_linker_bad_host_with_arch() {
#[cargo_test]
fn custom_build_env_var_rustc_linker_cross_arch_host() {
let target = rustc_host();
@ -30,7 +30,7 @@ index d8fed64..851b5b2 100644
let cross_target = cross_compile::alternate();
let p = project()
.file(
@@ -779,6 +782,9 @@ fn custom_build_env_var_rustc_linker_cross_arch_host() {
@@ -780,6 +783,9 @@ fn custom_build_env_var_rustc_linker_cross_arch_host() {
#[cargo_test]
fn custom_build_linker_bad_cross_arch_host() {
let target = rustc_host();

54
debian/patches/cargo/c-2002_disable-net-tests.patch vendored
View File

@ -122,7 +122,7 @@ index b215958..d4f3678 100644
let p = project()
.file(
diff --git a/src/tools/cargo/tests/testsuite/publish.rs b/src/tools/cargo/tests/testsuite/publish.rs
index f618183..9b0333f 100644
index 38577bb..3347b97 100644
--- a/src/tools/cargo/tests/testsuite/publish.rs
+++ b/src/tools/cargo/tests/testsuite/publish.rs
@@ -88,7 +88,7 @@ fn validate_upload_li() {
@ -395,7 +395,7 @@ index f618183..9b0333f 100644
fn publish_git_with_version() {
let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -1594,7 +1594,7 @@ You may press ctrl-c [..]
@@ -1604,7 +1604,7 @@ You may press ctrl-c [..]
);
}
@ -404,7 +404,7 @@ index f618183..9b0333f 100644
fn publish_dev_dep_no_version() {
let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -1686,7 +1686,7 @@ repository = "foo"
@@ -1706,7 +1706,7 @@ path = "src/lib.rs"
);
}
@ -413,7 +413,7 @@ index f618183..9b0333f 100644
fn publish_with_feature_point_diff_kinds_dep() {
let registry = RegistryBuilder::new().http_api().http_index().build();
Package::new("normal-only", "1.0.0")
@@ -1984,7 +1984,8 @@ features = ["cat"]
@@ -2014,7 +2014,8 @@ features = ["cat"]
)],
);
}
@ -423,7 +423,7 @@ index f618183..9b0333f 100644
fn credentials_ambiguous_filename() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
@@ -2041,7 +2042,7 @@ You may press ctrl-c [..]
@@ -2071,7 +2072,7 @@ You may press ctrl-c [..]
// --index will not load registry.token to avoid possibly leaking
// crates.io token to another server.
@ -432,7 +432,7 @@ index f618183..9b0333f 100644
fn index_requires_token() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
@@ -2077,7 +2078,7 @@ fn index_requires_token() {
@@ -2107,7 +2108,7 @@ fn index_requires_token() {
}
// publish with source replacement without --registry
@ -441,7 +441,7 @@ index f618183..9b0333f 100644
fn cratesio_source_replacement() {
registry::init();
let p = project()
@@ -2107,7 +2108,7 @@ include `--registry dummy-registry` or `--registry crates-io`
@@ -2137,7 +2138,7 @@ include `--registry dummy-registry` or `--registry crates-io`
.run();
}
@ -450,7 +450,7 @@ index f618183..9b0333f 100644
fn publish_with_missing_readme() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
@@ -2156,7 +2157,7 @@ Caused by:
@@ -2186,7 +2187,7 @@ Caused by:
}
// Registry returns an API error.
@ -459,7 +459,7 @@ index f618183..9b0333f 100644
fn api_error_json() {
let _registry = registry::RegistryBuilder::new()
.alternative()
@@ -2205,7 +2206,7 @@ Caused by:
@@ -2235,7 +2236,7 @@ Caused by:
}
// Registry returns an API error with a 200 status code.
@ -468,7 +468,7 @@ index f618183..9b0333f 100644
fn api_error_200() {
let _registry = registry::RegistryBuilder::new()
.alternative()
@@ -2254,7 +2255,7 @@ Caused by:
@@ -2284,7 +2285,7 @@ Caused by:
}
// Registry returns an error code without a JSON message.
@ -477,7 +477,7 @@ index f618183..9b0333f 100644
fn api_error_code() {
let _registry = registry::RegistryBuilder::new()
.alternative()
@@ -2310,7 +2311,7 @@ Caused by:
@@ -2340,7 +2341,7 @@ Caused by:
}
// Registry has a network error.
@ -486,7 +486,7 @@ index f618183..9b0333f 100644
fn api_curl_error() {
let _registry = registry::RegistryBuilder::new()
.alternative()
@@ -2361,7 +2362,7 @@ Caused by:
@@ -2391,7 +2392,7 @@ Caused by:
}
// Registry returns an invalid response.
@ -495,7 +495,7 @@ index f618183..9b0333f 100644
fn api_other_error() {
let _registry = registry::RegistryBuilder::new()
.alternative()
@@ -2412,7 +2413,7 @@ Caused by:
@@ -2442,7 +2443,7 @@ Caused by:
.run();
}
@ -504,7 +504,7 @@ index f618183..9b0333f 100644
fn in_package_workspace() {
let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -2465,7 +2466,7 @@ You may press ctrl-c [..]
@@ -2495,7 +2496,7 @@ You may press ctrl-c [..]
validate_upload_li();
}
@ -513,7 +513,7 @@ index f618183..9b0333f 100644
fn with_duplicate_spec_in_members() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
@@ -2520,7 +2521,7 @@ fn with_duplicate_spec_in_members() {
@@ -2550,7 +2551,7 @@ fn with_duplicate_spec_in_members() {
.run();
}
@ -522,7 +522,7 @@ index f618183..9b0333f 100644
fn in_package_workspace_with_members_with_features_old() {
let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -2573,7 +2574,7 @@ You may press ctrl-c [..]
@@ -2603,7 +2604,7 @@ You may press ctrl-c [..]
validate_upload_li();
}
@ -531,7 +531,7 @@ index f618183..9b0333f 100644
fn in_virtual_workspace() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
@@ -2610,7 +2611,7 @@ fn in_virtual_workspace() {
@@ -2640,7 +2641,7 @@ fn in_virtual_workspace() {
.run();
}
@ -540,7 +540,7 @@ index f618183..9b0333f 100644
fn in_virtual_workspace_with_p() {
// `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build();
@@ -2670,7 +2671,7 @@ You may press ctrl-c [..]
@@ -2700,7 +2701,7 @@ You may press ctrl-c [..]
.run();
}
@ -549,7 +549,7 @@ index f618183..9b0333f 100644
fn in_package_workspace_not_found() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
@@ -2715,7 +2716,7 @@ error: package ID specification `li` did not match any packages
@@ -2745,7 +2746,7 @@ error: package ID specification `li` did not match any packages
.run();
}
@ -558,7 +558,7 @@ index f618183..9b0333f 100644
fn in_package_workspace_found_multiple() {
// Use local registry for faster test times since no publish will occur
let registry = registry::init();
@@ -2772,7 +2773,7 @@ error: the `-p` argument must be specified to select a single package to publish
@@ -2802,7 +2803,7 @@ error: the `-p` argument must be specified to select a single package to publish
.run();
}
@ -567,7 +567,7 @@ index f618183..9b0333f 100644
// 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
@@ -2819,7 +2820,7 @@ error: package ID specification `bar` did not match any packages
@@ -2849,7 +2850,7 @@ error: package ID specification `bar` did not match any packages
.run();
}
@ -576,7 +576,7 @@ index f618183..9b0333f 100644
fn http_api_not_noop() {
let registry = registry::RegistryBuilder::new().http_api().build();
@@ -2882,7 +2883,7 @@ You may press ctrl-c [..]
@@ -2912,7 +2913,7 @@ You may press ctrl-c [..]
p.cargo("build").run();
}
@ -585,7 +585,7 @@ index f618183..9b0333f 100644
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));
@@ -2966,7 +2967,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
@@ -2996,7 +2997,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
/// 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.
@ -594,7 +594,7 @@ index f618183..9b0333f 100644
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));
@@ -3064,7 +3065,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
@@ -3094,7 +3095,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("build").with_status(0).run();
}
@ -603,7 +603,7 @@ index f618183..9b0333f 100644
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));
@@ -3158,7 +3159,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
@@ -3188,7 +3189,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("check").with_status(0).run();
}
@ -612,7 +612,7 @@ index f618183..9b0333f 100644
fn skip_wait_for_publish() {
// Intentionally using local registry so the crate never makes it to the index
let registry = registry::init();
@@ -3202,7 +3203,7 @@ See [..]
@@ -3232,7 +3233,7 @@ See [..]
.run();
}
@ -621,7 +621,7 @@ index f618183..9b0333f 100644
fn timeout_waiting_for_publish() {
// Publish doesn't happen within the timeout window.
let registry = registry::RegistryBuilder::new()
@@ -3255,7 +3256,7 @@ warning: timed out waiting for `delay v0.0.1` to be available in registry `crate
@@ -3285,7 +3286,7 @@ warning: timed out waiting for `delay v0.0.1` to be available in registry `crate
.run();
}

4
debian/patches/cargo/d-0012-cargo-always-return-dev-channel.patch vendored
View File

@ -9,10 +9,10 @@ Forwarded: not-needed
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 e4d559c..224ddc5 100644
index f613bdf..d3e76ee 100644
--- a/src/tools/cargo/src/cargo/core/features.rs
+++ b/src/tools/cargo/src/cargo/core/features.rs
@@ -1263,9 +1263,8 @@ pub fn channel() -> String {
@@ -1389,9 +1389,8 @@ pub fn channel() -> String {
return "dev".to_string();
}
}

41
debian/patches/prune/d-0000-ignore-removed-submodules.patch vendored
View File

@ -7,18 +7,18 @@ order to both reduce the orig tarball and the vendored crates within.
Forwarded: not-needed
---
Cargo.toml | 7 -----
Cargo.toml | 6 ----
src/bootstrap/bootstrap.py | 4 ---
src/bootstrap/src/core/build_steps/test.rs | 12 +-------
src/bootstrap/src/core/builder.rs | 47 ++++++------------------------
src/tools/rust-analyzer/Cargo.toml | 11 ++++++-
5 files changed, 20 insertions(+), 61 deletions(-)
5 files changed, 20 insertions(+), 60 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml
index 1379e4c..37150f2 100644
index a601ebf..37150f2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,23 +20,16 @@ members = [
@@ -20,22 +20,16 @@ members = [
"src/tools/tidy",
"src/tools/tier-check",
"src/tools/build-manifest",
@ -33,7 +33,6 @@ index 1379e4c..37150f2 100644
- "src/tools/miri/cargo-miri",
"src/tools/rustdoc-themes",
"src/tools/unicode-table-generator",
- "src/tools/expand-yaml-anchors",
"src/tools/jsondocck",
"src/tools/jsondoclint",
"src/tools/llvm-bitcode-linker",
@ -43,10 +42,10 @@ index 1379e4c..37150f2 100644
"src/tools/lld-wrapper",
"src/tools/collect-license-metadata",
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index e464e44..e176c4c 100644
index 9861121..879d44d 100644
--- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py
@@ -991,10 +991,6 @@ class RustBuild(object):
@@ -1007,10 +1007,6 @@ class RustBuild(object):
args = [self.cargo(), "build", "--manifest-path",
os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
args.extend("--verbose" for _ in range(self.verbose))
@ -58,10 +57,10 @@ index e464e44..e176c4c 100644
args.append("--features")
args.append("build-metrics")
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index 411ed99..2b8f1d1 100644
index aaedee6..557f71c 100644
--- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -2472,17 +2472,7 @@ impl Step for RustcGuide {
@@ -2430,17 +2430,7 @@ impl Step for RustcGuide {
}
fn run(self, builder: &Builder<'_>) {
@ -81,10 +80,10 @@ index 411ed99..2b8f1d1 100644
}
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
index d0d9b1c..19691dd 100644
index b3d8465..e41070c 100644
--- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs
@@ -724,25 +724,14 @@ impl<'a> Builder<'a> {
@@ -730,25 +730,14 @@ impl<'a> Builder<'a> {
tool::Linkchecker,
tool::CargoTest,
tool::Compiletest,
@ -110,7 +109,7 @@ index d0d9b1c..19691dd 100644
tool::OptimizedDist,
tool::CoverageDump,
tool::LlvmBitcodeLinker
@@ -781,12 +770,7 @@ impl<'a> Builder<'a> {
@@ -787,12 +776,7 @@ impl<'a> Builder<'a> {
check::Rustdoc,
check::CodegenBackend,
check::Clippy,
@ -123,7 +122,7 @@ index d0d9b1c..19691dd 100644
check::Bootstrap,
),
Kind::Test => describe!(
@@ -820,7 +804,6 @@ impl<'a> Builder<'a> {
@@ -825,7 +809,6 @@ impl<'a> Builder<'a> {
test::TierCheck,
test::Cargotest,
test::Cargo,
@ -131,7 +130,7 @@ index d0d9b1c..19691dd 100644
test::ErrorIndex,
test::Distcheck,
test::RunMakeFullDeps,
@@ -836,8 +819,6 @@ impl<'a> Builder<'a> {
@@ -841,8 +824,6 @@ impl<'a> Builder<'a> {
test::EmbeddedBook,
test::EditionGuide,
test::Rustfmt,
@ -140,7 +139,7 @@ index d0d9b1c..19691dd 100644
test::Clippy,
test::RustDemangler,
test::CompiletestTest,
@@ -876,7 +857,6 @@ impl<'a> Builder<'a> {
@@ -881,7 +862,6 @@ impl<'a> Builder<'a> {
doc::CargoBook,
doc::Clippy,
doc::ClippyBook,
@ -148,7 +147,7 @@ index d0d9b1c..19691dd 100644
doc::EmbeddedBook,
doc::EditionGuide,
doc::StyleGuide,
@@ -896,12 +876,9 @@ impl<'a> Builder<'a> {
@@ -902,12 +882,9 @@ impl<'a> Builder<'a> {
dist::Analysis,
dist::Src,
dist::Cargo,
@ -161,7 +160,7 @@ index d0d9b1c..19691dd 100644
dist::LlvmTools,
dist::LlvmBitcodeLinker,
dist::RustDev,
@@ -924,11 +901,9 @@ impl<'a> Builder<'a> {
@@ -930,11 +907,9 @@ impl<'a> Builder<'a> {
// install the same binaries twice for each tool, leaving backup files (*.old) as a result.
install::Rustc,
install::Cargo,
@ -173,7 +172,7 @@ index d0d9b1c..19691dd 100644
install::LlvmTools,
install::Src,
),
@@ -937,7 +912,6 @@ impl<'a> Builder<'a> {
@@ -942,7 +917,6 @@ impl<'a> Builder<'a> {
run::BuildManifest,
run::BumpStage0,
run::ReplaceVersionPlaceholder,
@ -181,7 +180,7 @@ index d0d9b1c..19691dd 100644
run::CollectLicenseMetadata,
run::GenerateCopyright,
run::GenerateWindowsSys,
@@ -2076,10 +2050,7 @@ impl<'a> Builder<'a> {
@@ -2081,10 +2055,7 @@ impl<'a> Builder<'a> {
}
}
@ -193,7 +192,7 @@ index d0d9b1c..19691dd 100644
cargo.arg("--frozen");
}
@@ -2231,16 +2202,16 @@ impl<'a> Builder<'a> {
@@ -2233,16 +2204,16 @@ impl<'a> Builder<'a> {
static SUBMODULES_PATHS: OnceLock<Vec<String>> = OnceLock::new();
let init_submodules_paths = |src: &PathBuf| {
@ -219,7 +218,7 @@ index d0d9b1c..19691dd 100644
submodules_paths
};
diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
index f7e3ae5..771ae2a 100644
index ccc27e2..b197013 100644
--- a/src/tools/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/Cargo.toml
@@ -1,5 +1,14 @@

60
debian/patches/prune/d-0002-mdbook-strip-embedded-libs.patch vendored
View File

@ -10,12 +10,12 @@ Forwarded: not-needed
---
src/doc/rust-by-example/theme/index.hbs | 86 +----------------
src/tools/linkchecker/main.rs | 28 +++++-
vendor/mdbook-0.4.37/src/book/init.rs | 19 ----
vendor/mdbook-0.4.40/src/book/init.rs | 19 ----
.../src/renderer/html_handlebars/hbs_renderer.rs | 104 ++++-----------------
.../src/renderer/html_handlebars/search.rs | 2 -
vendor/mdbook-0.4.37/src/theme/index.hbs | 86 +----------------
vendor/mdbook-0.4.37/src/theme/mod.rs | 27 ------
vendor/mdbook-0.4.37/src/theme/searcher/mod.rs | 2 -
vendor/mdbook-0.4.40/src/theme/index.hbs | 86 +----------------
vendor/mdbook-0.4.40/src/theme/mod.rs | 27 ------
vendor/mdbook-0.4.40/src/theme/searcher/mod.rs | 2 -
8 files changed, 51 insertions(+), 303 deletions(-)
diff --git a/src/doc/rust-by-example/theme/index.hbs b/src/doc/rust-by-example/theme/index.hbs
@ -137,10 +137,10 @@ index 3876555..18ec61f 100644
<!-- Custom JS scripts -->
{{#each additional_js}}
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index f49c6e7..c8ecfd3 100644
index 32f935d..18ea70c 100644
--- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs
@@ -162,7 +162,17 @@ impl Checker {
@@ -164,7 +164,17 @@ impl Checker {
for entry in t!(dir.read_dir()).map(|e| t!(e)) {
let path = entry.path();
// Goes through symlinks
@ -159,7 +159,7 @@ index f49c6e7..c8ecfd3 100644
if metadata.is_dir() {
self.walk(&path, report);
} else {
@@ -175,7 +185,15 @@ impl Checker {
@@ -177,7 +187,15 @@ impl Checker {
fn check(&mut self, file: &Path, report: &mut Report) {
let (pretty_path, entry) = self.load_file(file, report);
let source = match entry {
@ -176,7 +176,7 @@ index f49c6e7..c8ecfd3 100644
FileEntry::Dir => unreachable!("never with `check` path"),
FileEntry::OtherFile => return,
FileEntry::Redirect { .. } => return,
@@ -264,6 +282,12 @@ impl Checker {
@@ -266,6 +284,12 @@ impl Checker {
let (target_pretty_path, target_entry) = self.load_file(&path, report);
let (target_source, target_ids) = match target_entry {
FileEntry::Missing => {
@ -189,10 +189,10 @@ index f49c6e7..c8ecfd3 100644
if is_exception(file, &target_pretty_path) {
report.links_ignored_exception += 1;
} else {
diff --git a/vendor/mdbook-0.4.37/src/book/init.rs b/vendor/mdbook-0.4.37/src/book/init.rs
diff --git a/vendor/mdbook-0.4.40/src/book/init.rs b/vendor/mdbook-0.4.40/src/book/init.rs
index faca1d0..c1a82a3 100644
--- a/vendor/mdbook-0.4.37/src/book/init.rs
+++ b/vendor/mdbook-0.4.37/src/book/init.rs
--- a/vendor/mdbook-0.4.40/src/book/init.rs
+++ b/vendor/mdbook-0.4.40/src/book/init.rs
@@ -153,25 +153,6 @@ impl BookBuilder {
let mut js = File::create(themedir.join("book.js"))?;
js.write_all(theme::JS)?;
@ -219,10 +219,10 @@ index faca1d0..c1a82a3 100644
Ok(())
}
diff --git a/vendor/mdbook-0.4.37/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook-0.4.37/src/renderer/html_handlebars/hbs_renderer.rs
index b706108..b16552c 100644
--- a/vendor/mdbook-0.4.37/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/vendor/mdbook-0.4.37/src/renderer/html_handlebars/hbs_renderer.rs
diff --git a/vendor/mdbook-0.4.40/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook-0.4.40/src/renderer/html_handlebars/hbs_renderer.rs
index d304259..c89eaea 100644
--- a/vendor/mdbook-0.4.40/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/vendor/mdbook-0.4.40/src/renderer/html_handlebars/hbs_renderer.rs
@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEditio
use crate::errors::*;
use crate::renderer::html_handlebars::helpers;
@ -239,7 +239,7 @@ index b706108..b16552c 100644
use std::path::{Path, PathBuf};
use crate::utils::fs::get_404_output_file;
@@ -249,99 +250,28 @@ impl HtmlHandlebars {
@@ -253,99 +254,28 @@ impl HtmlHandlebars {
if let Some(contents) = &theme.favicon_svg {
write_file(destination, "favicon.svg", contents)?;
}
@ -354,10 +354,10 @@ index b706108..b16552c 100644
Ok(())
}
diff --git a/vendor/mdbook-0.4.37/src/renderer/html_handlebars/search.rs b/vendor/mdbook-0.4.37/src/renderer/html_handlebars/search.rs
diff --git a/vendor/mdbook-0.4.40/src/renderer/html_handlebars/search.rs b/vendor/mdbook-0.4.40/src/renderer/html_handlebars/search.rs
index 1144c9f..97f9b0d 100644
--- a/vendor/mdbook-0.4.37/src/renderer/html_handlebars/search.rs
+++ b/vendor/mdbook-0.4.37/src/renderer/html_handlebars/search.rs
--- a/vendor/mdbook-0.4.40/src/renderer/html_handlebars/search.rs
+++ b/vendor/mdbook-0.4.40/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(),
)?;
@ -367,10 +367,10 @@ index 1144c9f..97f9b0d 100644
debug!("Copying search files ✓");
}
diff --git a/vendor/mdbook-0.4.37/src/theme/index.hbs b/vendor/mdbook-0.4.37/src/theme/index.hbs
diff --git a/vendor/mdbook-0.4.40/src/theme/index.hbs b/vendor/mdbook-0.4.40/src/theme/index.hbs
index 080b785..f6064f6 100644
--- a/vendor/mdbook-0.4.37/src/theme/index.hbs
+++ b/vendor/mdbook-0.4.37/src/theme/index.hbs
--- a/vendor/mdbook-0.4.40/src/theme/index.hbs
+++ b/vendor/mdbook-0.4.40/src/theme/index.hbs
@@ -33,10 +33,7 @@
{{/if}}
@ -485,10 +485,10 @@ index 080b785..f6064f6 100644
<!-- Custom JS scripts -->
{{#each additional_js}}
diff --git a/vendor/mdbook-0.4.37/src/theme/mod.rs b/vendor/mdbook-0.4.37/src/theme/mod.rs
index 6e6b509..ef8886b 100644
--- a/vendor/mdbook-0.4.37/src/theme/mod.rs
+++ b/vendor/mdbook-0.4.37/src/theme/mod.rs
diff --git a/vendor/mdbook-0.4.40/src/theme/mod.rs b/vendor/mdbook-0.4.40/src/theme/mod.rs
index 1c108d6..388e4d6 100644
--- a/vendor/mdbook-0.4.40/src/theme/mod.rs
+++ b/vendor/mdbook-0.4.40/src/theme/mod.rs
@@ -1,9 +1,5 @@
#![allow(missing_docs)]
@ -553,7 +553,7 @@ index 6e6b509..ef8886b 100644
}
}
}
@@ -273,11 +249,8 @@ mod tests {
@@ -272,11 +248,8 @@ mod tests {
favicon_png: Some(Vec::new()),
favicon_svg: Some(Vec::new()),
js: Vec::new(),
@ -565,10 +565,10 @@ index 6e6b509..ef8886b 100644
};
assert_eq!(got, empty);
diff --git a/vendor/mdbook-0.4.37/src/theme/searcher/mod.rs b/vendor/mdbook-0.4.37/src/theme/searcher/mod.rs
diff --git a/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs b/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs
index d5029db..59eda8a 100644
--- a/vendor/mdbook-0.4.37/src/theme/searcher/mod.rs
+++ b/vendor/mdbook-0.4.37/src/theme/searcher/mod.rs
--- a/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs
+++ b/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs
@@ -2,5 +2,3 @@
//! the "search" cargo feature is disabled.

4
debian/patches/prune/d-0005-no-jemalloc.patch vendored
View File

@ -30,7 +30,7 @@ index 3cb56a7..af37dfc 100644
max_level_info = ['rustc_driver_impl/max_level_info']
rustc_use_parallel_compiler = ['rustc_driver_impl/rustc_use_parallel_compiler']
diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
index a87b67f..fe256c5 100644
index 11a8e7a..9de8031 100644
--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
@@ -18,7 +18,6 @@ cfg-if = "1.0.0"
@ -41,7 +41,7 @@ index a87b67f..fe256c5 100644
[target.'cfg(target_os = "linux")'.dependencies]
perf-event = "=0.4.7"
@@ -28,7 +27,6 @@ winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
@@ -28,7 +27,6 @@ windows-sys = { version = "0.52", features = ["Win32_System_Threading", "Win32_S
[features]
cpu_profiler = []

4
debian/patches/prune/d-0010-cargo-remove-vendored-c-crates.patch vendored
View File

@ -12,11 +12,11 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
index 9f2b4a0..c844fd4 100644
index fbc8086..2ce85e46 100644
--- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml
@@ -77,7 +77,7 @@ proptest = "1.4.0"
pulldown-cmark = { version = "0.10.2", default-features = false, features = ["html"] }
pulldown-cmark = { version = "0.10.3", default-features = false, features = ["html"] }
rand = "0.8.5"
regex = "1.10.4"
-rusqlite = { version = "0.31.0", features = ["bundled"] }

199
debian/patches/prune/d-0020-remove-windows-dependencies.patch vendored
View File

@ -20,7 +20,7 @@ Forwarded: not-needed
compiler/rustc_driver_impl/Cargo.toml | 6 -----
compiler/rustc_errors/Cargo.toml | 8 -------
compiler/rustc_session/Cargo.toml | 7 ------
library/backtrace/Cargo.toml | 13 -----------
library/backtrace/Cargo.toml | 15 -------------
src/bootstrap/Cargo.toml | 15 -------------
src/tools/cargo/Cargo.toml | 26 ++++------------------
.../cargo/crates/cargo-test-support/Cargo.toml | 3 ---
@ -30,15 +30,23 @@ Forwarded: not-needed
src/tools/cargo/src/cargo/util/auth/mod.rs | 5 -----
src/tools/compiletest/Cargo.toml | 10 ---------
src/tools/rust-analyzer/crates/profile/Cargo.toml | 3 ---
.../rust-analyzer/crates/rust-analyzer/Cargo.toml | 6 -----
.../rust-analyzer/crates/rust-analyzer/Cargo.toml | 3 ---
src/tools/rust-analyzer/crates/stdx/Cargo.toml | 4 ----
17 files changed, 4 insertions(+), 129 deletions(-)
src/tools/rustc-perf/collector/Cargo.toml | 4 ----
.../compile-benchmarks/cargo-0.60.0/Cargo.toml | 24 --------------------
.../style-servo/components/gfx/Cargo.toml | 4 ----
.../style-servo/components/style/Cargo.toml | 3 ---
.../native-tls-0.1.5/Cargo.toml | 4 +---
.../example-compositor/compositor/Cargo.toml | 3 ---
.../webrender-2022/webrender/Cargo.toml | 3 ---
.../webrender-2022/wrench/Cargo.toml | 4 ----
25 files changed, 5 insertions(+), 176 deletions(-)
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index f347a7f..364ee43 100644
index 3771fc6..7165686 100644
--- a/compiler/rustc_codegen_ssa/Cargo.toml
+++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -51,7 +51,3 @@ libc = "0.2.50"
@@ -53,7 +53,3 @@ libc = "0.2.50"
version = "0.32.1"
default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
@ -47,7 +55,7 @@ index f347a7f..364ee43 100644
-version = "0.52.0"
-features = ["Win32_Globalization"]
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
index 80b6e72..be1f100 100644
index 2b61e17..67c289c 100644
--- a/compiler/rustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml
@@ -32,16 +32,6 @@ tracing = "0.1"
@ -68,10 +76,10 @@ index 80b6e72..be1f100 100644
# tidy-alphabetical-start
memmap2 = "0.2.1"
diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
index a8bba3a..31f122c 100644
index 5f7504a..db00180 100644
--- a/compiler/rustc_driver_impl/Cargo.toml
+++ b/compiler/rustc_driver_impl/Cargo.toml
@@ -59,12 +59,6 @@ tracing = { version = "0.1.35" }
@@ -58,12 +58,6 @@ tracing = { version = "0.1.35" }
libc = "0.2"
# tidy-alphabetical-end
@ -119,10 +127,10 @@ index 721a927..099c79d 100644
- "Win32_System_LibraryLoader",
-]
diff --git a/library/backtrace/Cargo.toml b/library/backtrace/Cargo.toml
index 9bd7b63..acef294 100644
index 3c71024..f1c049a 100644
--- a/library/backtrace/Cargo.toml
+++ b/library/backtrace/Cargo.toml
@@ -49,9 +49,6 @@ version = "0.32.0"
@@ -49,9 +49,6 @@ version = "0.36.0"
default-features = false
features = ['read_core', 'elf', 'macho', 'pe', 'xcoff', 'unaligned', 'archive']
@ -132,7 +140,7 @@ index 9bd7b63..acef294 100644
[build-dependencies]
# Only needed for Android, but cannot be target dependent
# https://github.com/rust-lang/cargo/issues/4932
@@ -88,16 +85,6 @@ libbacktrace = []
@@ -83,18 +80,6 @@ kernel32 = []
libunwind = []
unix-backtrace = []
verify-winapi = [
@ -146,14 +154,16 @@ index 9bd7b63..acef294 100644
- 'winapi/tlhelp32',
- 'winapi/winbase',
- 'winapi/winnt',
- 'winapi/winnls',
- 'winapi/stringapiset',
]
[[example]]
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index c7a513d..3c6bfc5 100644
index 32dd3ef..17d14bc 100644
--- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml
@@ -66,21 +66,6 @@ xz2 = "0.1"
@@ -67,21 +67,6 @@ xz2 = "0.1"
# Dependencies needed by the build-metrics feature
sysinfo = { version = "0.30", default-features = false, optional = true }
@ -176,7 +186,7 @@ index c7a513d..3c6bfc5 100644
pretty_assertions = "1.4"
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
index c844fd4..0a430c4 100644
index 2ce85e46..70c08a5 100644
--- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml
@@ -2,7 +2,9 @@
@ -244,10 +254,10 @@ index c844fd4..0a430c4 100644
annotate-snippets = { workspace = true, features = ["testing-colors"] }
cargo-test-macro.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 fd64a66..3f1d64a 100644
index 9d6ca73..443ca9d 100644
--- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
@@ -33,8 +33,5 @@ toml.workspace = true
@@ -34,8 +34,5 @@ toml.workspace = true
url.workspace = true
walkdir.workspace = true
@ -257,7 +267,7 @@ index fd64a66..3f1d64a 100644
[lints]
workspace = true
diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml
index 28877ee..e859b49 100644
index f084dad..02c451c 100644
--- a/src/tools/cargo/crates/cargo-util/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
@@ -21,15 +21,8 @@ tempfile.workspace = true
@ -290,7 +300,7 @@ index 91742e5..0054cad 100644
[lints]
workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml
index 4ed0d32..fc2df44 100644
index 63fd823..55f8d9c 100644
--- a/src/tools/cargo/credential/cargo-credential/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml
@@ -18,9 +18,6 @@ time.workspace = true
@ -338,7 +348,7 @@ index 52beb4c8..50acf5b 100644
- "Win32_System_Diagnostics_Debug",
-]
diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
index fe256c5..8178a9d 100644
index 9de8031..8178a9d 100644
--- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
@@ -22,9 +22,6 @@ countme = { version = "3.0.1", features = ["enable"] }
@ -346,30 +356,27 @@ index fe256c5..8178a9d 100644
perf-event = "=0.4.7"
-[target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.9", features = ["processthreadsapi", "psapi"] }
-windows-sys = { version = "0.52", features = ["Win32_System_Threading", "Win32_System_ProcessStatus"] }
-
[features]
cpu_profiler = []
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
index cd33498..5a4a443 100644
index 34b3e49..a684752 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -68,12 +68,6 @@ vfs-notify.workspace = true
@@ -69,9 +69,6 @@ vfs-notify.workspace = true
vfs.workspace = true
paths.workspace = true
-[target.'cfg(windows)'.dependencies]
-winapi = "0.3.9"
-windows-sys = { version = "0.52", features = ["Win32_System_Threading"] }
-
-[target.'cfg(not(target_env = "msvc"))'.dependencies]
-jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true }
-
[dev-dependencies]
expect-test = "1.4.0"
xshell.workspace = true
[target.'cfg(not(target_env = "msvc"))'.dependencies]
jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true }
diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
index 6cca116..7e3b4c1 100644
index 99824df..7e3b4c1 100644
--- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
@@ -20,10 +20,6 @@ crossbeam-channel = "0.5.5"
@ -378,8 +385,138 @@ index 6cca116..7e3b4c1 100644
-[target.'cfg(windows)'.dependencies]
-miow = "0.6.0"
-winapi = { version = "0.3.9", features = ["winerror"] }
-windows-sys = { version = "0.52", features = ["Win32_Foundation"] }
-
[features]
# Uncomment to enable for the whole crate graph
# default = [ "backtrace" ]
diff --git a/src/tools/rustc-perf/collector/Cargo.toml b/src/tools/rustc-perf/collector/Cargo.toml
index fed0fa9..2163f64 100644
--- a/src/tools/rustc-perf/collector/Cargo.toml
+++ b/src/tools/rustc-perf/collector/Cargo.toml
@@ -45,10 +45,6 @@ analyzeme = "12.0.0"
benchlib = { path = "benchlib" }
-[target.'cfg(windows)'.dependencies]
-miow = "0.3"
-windows-sys = { version = "0.45.0", features = ["Win32_Foundation"] }
-
[features]
# Enable more precise Cachegrind profiles for runtime benchmarks.
# Requires a recent Valgrind to be installed.
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.60.0/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.60.0/Cargo.toml
index 12ee1ee..a89f82f 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.60.0/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/cargo-0.60.0/Cargo.toml
@@ -209,28 +209,4 @@ deny-warnings = []
pretty-env-logger = ["pretty_env_logger"]
vendored-openssl = ["openssl/vendored"]
-[target."cfg(windows)".dependencies.fwdansi]
-version = "1.1.0"
-
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = [
- "basetsd",
- "handleapi",
- "jobapi",
- "jobapi2",
- "memoryapi",
- "minwindef",
- "ntdef",
- "ntstatus",
- "processenv",
- "processthreadsapi",
- "psapi",
- "synchapi",
- "winerror",
- "winbase",
- "wincon",
- "winnt",
-]
-
[workspace]
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/gfx/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/gfx/Cargo.toml
index 3d7aea1..57feefe 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/gfx/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/gfx/Cargo.toml
@@ -59,7 +59,3 @@ xml5ever = {version = "0.10"}
[target.'cfg(any(target_feature = "sse2", target_feature = "neon"))'.dependencies]
simd = "0.2.0"
-
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.4"
-truetype = "0.26"
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/style/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/style/Cargo.toml
index 23130d0..5f33889 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/style/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/style-servo/components/style/Cargo.toml
@@ -77,9 +77,6 @@ time = "0.1"
unicode-bidi = "0.3"
unicode-segmentation = "1.0"
-[target.'cfg(windows)'.dependencies]
-kernel32-sys = "0.2"
-
[build-dependencies]
lazy_static = "0.2"
log = "0.3"
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/tokio-webpush-simple/native-tls-0.1.5/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/tokio-webpush-simple/native-tls-0.1.5/Cargo.toml
index 38bd630e..6abd17c 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/tokio-webpush-simple/native-tls-0.1.5/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/tokio-webpush-simple/native-tls-0.1.5/Cargo.toml
@@ -33,7 +33,5 @@ version = "0.1.15"
[target."cfg(any(target_os = \"macos\", target_os = \"ios\"))".dependencies.tempdir]
version = "0.3"
-[target."cfg(target_os = \"windows\")".dependencies.schannel]
-version = "0.1.7"
-[workspace]
\ No newline at end of file
+[workspace]
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/example-compositor/compositor/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/example-compositor/compositor/Cargo.toml
index 4202332..2d35787 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/example-compositor/compositor/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/example-compositor/compositor/Cargo.toml
@@ -9,8 +9,5 @@ license = "MPL-2.0"
webrender = { path = "../../webrender" }
gleam = "0.13.1"
-[target.'cfg(windows)'.dependencies]
-compositor-windows = { path = "../compositor-windows" }
-
[target.'cfg(target_os = "linux")'.dependencies]
compositor-wayland = { path = "../compositor-wayland" }
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/webrender/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/webrender/Cargo.toml
index ee727d4..ddc3c14 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/webrender/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/webrender/Cargo.toml
@@ -61,9 +61,6 @@ rand = "0.4"
freetype = { version = "0.7", default-features = false }
libc = "0.2"
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.11"
-
[target.'cfg(target_os = "macos")'.dependencies]
core-foundation = "0.9.2"
core-graphics = "0.22.3"
diff --git a/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/Cargo.toml b/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/Cargo.toml
index 04101b9..9b6e1e5 100644
--- a/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/Cargo.toml
+++ b/src/tools/rustc-perf/collector/compile-benchmarks/webrender-2022/wrench/Cargo.toml
@@ -42,10 +42,6 @@ default = [ "env_logger" ]
headless = [ "osmesa-sys", "osmesa-src" ]
software = [ "swgl" ]
-[target.'cfg(target_os = "windows")'.dependencies]
-dwrote = "0.11"
-mozangle = { version = "0.3.2", features = ["egl"] }
-
[target.'cfg(all(unix, not(target_os = "android")))'.dependencies]
font-loader = "0.11"

940
debian/patches/prune/d-0021-vendor-remove-windows-dependencies.patch vendored
View File

File diff suppressed because it is too large Load Diff

8
debian/patches/ubuntu/ubuntu-disable-ppc64el-asm-tests.patch vendored
View File

@ -9,10 +9,10 @@ Forwarded: not-needed
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
index 0c89e18..868865d 100644
index 8c9abea..3d551bc 100644
--- a/compiler/rustc_lint/src/builtin.rs
+++ b/compiler/rustc_lint/src/builtin.rs
@@ -2739,7 +2739,10 @@ declare_lint! {
@@ -2776,7 +2776,10 @@ declare_lint! {
/// ### Example
///
/// ```rust,compile_fail
@ -25,10 +25,10 @@ index 0c89e18..868865d 100644
///
/// fn main() {
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
index e74cc38..a5ca4c4 100644
index d0d570d..3182bdb 100644
--- a/compiler/rustc_lint_defs/src/builtin.rs
+++ b/compiler/rustc_lint_defs/src/builtin.rs
@@ -3099,11 +3099,13 @@ declare_lint! {
@@ -2969,11 +2969,13 @@ declare_lint! {
///
/// use std::arch::asm;
///

6
debian/patches/upstream/Revert-loongarch-add-frecipe-and-relax-target-feature.patch vendored
View File

@ -15,10 +15,10 @@ Bug: https://github.com/rust-lang/rust/issues/114661
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/compiler/rustc_target/src/target_features.rs b/compiler/rustc_target/src/target_features.rs
index 1b507bb..800907b 100644
index d981254..1b038a2 100644
--- a/compiler/rustc_target/src/target_features.rs
+++ b/compiler/rustc_target/src/target_features.rs
@@ -378,12 +378,10 @@ const LOONGARCH_ALLOWED_FEATURES: &[(&str, Stability)] = &[
@@ -376,12 +376,10 @@ const LOONGARCH_ALLOWED_FEATURES: &[(&str, Stability)] = &[
// tidy-alphabetical-start
("d", Unstable(sym::loongarch_target_feature)),
("f", Unstable(sym::loongarch_target_feature)),
@ -32,7 +32,7 @@ index 1b507bb..800907b 100644
// tidy-alphabetical-end
];
diff --git a/tests/ui/abi/compatibility.rs b/tests/ui/abi/compatibility.rs
index 373d1cc..f77766b 100644
index c27a107..2717cc7 100644
--- a/tests/ui/abi/compatibility.rs
+++ b/tests/ui/abi/compatibility.rs
@@ -39,7 +39,7 @@

6
debian/patches/upstream/d-disable-download-tests.patch vendored
View File

@ -8,10 +8,10 @@ Forwarded: no
1 file changed, 6 insertions(+)
diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs
index 59e16b6..9a871ec 100644
index bfb2c02..7fb81f6 100644
--- a/src/bootstrap/src/core/config/tests.rs
+++ b/src/bootstrap/src/core/config/tests.rs
@@ -26,6 +26,9 @@ fn parse(config: &str) -> Config {
@@ -21,6 +21,9 @@ fn parse(config: &str) -> Config {
#[test]
fn download_ci_llvm() {
@ -21,7 +21,7 @@ index 59e16b6..9a871ec 100644
if crate::core::build_steps::llvm::is_ci_llvm_modified(&parse("")) {
eprintln!("Detected LLVM as non-available: running in CI and modified LLVM in this change");
return;
@@ -57,6 +60,9 @@ fn download_ci_llvm() {
@@ -52,6 +55,9 @@ fn download_ci_llvm() {
// - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487
#[test]
fn detect_src_and_out() {

4
debian/patches/upstream/u-fix-get-toml-when-test.patch vendored
View File

@ -14,10 +14,10 @@ Last-Update: 2023-03-29
1 file changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index 149a62f..117c65d 100644
index 17e37c1..cf0048b 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -1205,8 +1205,32 @@ impl Config {
@@ -1188,8 +1188,32 @@ impl Config {
pub fn parse(args: &[String]) -> Config {
#[cfg(test)]

4
debian/patches/upstream/u-hurd-tests.patch vendored
View File

@ -23,10 +23,10 @@ index 23d1507..e0714e5 100644
// To prevent "overflow while adding drop-check rules".
use std::mem::ManuallyDrop;
diff --git a/tests/run-make/long-linker-command-lines/foo.rs b/tests/run-make/long-linker-command-lines/foo.rs
index db238c0..c8ad6b8 100644
index 9d4a701..f05130f 100644
--- a/tests/run-make/long-linker-command-lines/foo.rs
+++ b/tests/run-make/long-linker-command-lines/foo.rs
@@ -44,6 +44,13 @@ fn read_linker_args(path: &Path) -> String {
@@ -42,6 +42,13 @@ fn read_linker_args(path: &Path) -> String {
}
}

12
debian/patches/vendor/d-0003-cc-psm-rebuild-wasm32.patch vendored
View File

@ -4,15 +4,15 @@ Subject: d-0003-cc-psm-rebuild-wasm32
Forwarded: not-needed
---
vendor/cc-1.0.92/src/lib.rs | 2 +-
vendor/cc-1.0.97/src/lib.rs | 2 +-
vendor/psm-0.1.21/build.rs | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/vendor/cc-1.0.92/src/lib.rs b/vendor/cc-1.0.92/src/lib.rs
index 17a9c05..693a733 100644
--- a/vendor/cc-1.0.92/src/lib.rs
+++ b/vendor/cc-1.0.92/src/lib.rs
@@ -2815,7 +2815,7 @@ impl Build {
diff --git a/vendor/cc-1.0.97/src/lib.rs b/vendor/cc-1.0.97/src/lib.rs
index d7122ae..d2b7cf7 100644
--- a/vendor/cc-1.0.97/src/lib.rs
+++ b/vendor/cc-1.0.97/src/lib.rs
@@ -2863,7 +2863,7 @@ impl Build {
|| target == "wasm32-unknown-wasi"
|| target == "wasm32-unknown-unknown"
{