proxmox-mirrors/rustc
1
0
Fork 0
mirror of https://git.proxmox.com/git/rustc synced 2025-08-09 10:11:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update of patches for 1.84.0+dfsg1

Browse Source 
including rust-analyzer

Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
This commit is contained in:
Fabian Grünbichler 2025-01-10 10:57:02 +01:00
parent c4766bfe65
commit b1ff7e314b
28 changed files with 497 additions and 445 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

@ -26,10 +26,10 @@ Forwarded: no
2 files changed, 10 insertions(+), 1 deletion(-) 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index 34dc599..2fbe842 100644 index 6a2a394..371c386 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs --- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -2530,6 +2530,13 @@ fn add_order_independent_options( @@ -2573,6 +2573,13 @@ fn add_order_independent_options(
} }
add_rpath_args(cmd, sess, codegen_results, out_filename); add_rpath_args(cmd, sess, codegen_results, out_filename);

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

@ -10,7 +10,7 @@ Forwarded: not-needed
2 files changed, 10 deletions(-) 2 files changed, 10 deletions(-)
diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css diff --git a/src/librustdoc/html/static/css/rustdoc.css b/src/librustdoc/html/static/css/rustdoc.css
index df9776f..df4fcee 100644 index 66a8a19..acc2c5a 100644
--- a/src/librustdoc/html/static/css/rustdoc.css --- a/src/librustdoc/html/static/css/rustdoc.css
+++ b/src/librustdoc/html/static/css/rustdoc.css +++ b/src/librustdoc/html/static/css/rustdoc.css
@@ -107,14 +107,6 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\ @@ -107,14 +107,6 @@ xmlns="http://www.w3.org/2000/svg" fill="black" height="18px">\
@ -20,7 +20,7 @@ index df9776f..df4fcee 100644
-/* Avoid using legacy CJK serif fonts in Windows like Batang. */ -/* Avoid using legacy CJK serif fonts in Windows like Batang. */
-@font-face { -@font-face {
- font-family: 'NanumBarunGothic'; - font-family: 'NanumBarunGothic';
- src: url("NanumBarunGothic-0f09457c7a19b7c6.ttf.woff2") format("woff2"); - src: url("NanumBarunGothic-13b3dcba.ttf.woff2") format("woff2");
- font-display: swap; - font-display: swap;
- unicode-range: U+AC00-D7AF, U+1100-11FF, U+3130-318F, U+A960-A97F, U+D7B0-D7FF; - unicode-range: U+AC00-D7AF, U+1100-11FF, U+3130-318F, U+A960-A97F, U+D7B0-D7FF;
-} -}
@ -29,10 +29,10 @@ index df9776f..df4fcee 100644
box-sizing: border-box; box-sizing: border-box;
} }
diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs diff --git a/src/librustdoc/html/static_files.rs b/src/librustdoc/html/static_files.rs
index 6157598..aed3928 100644 index a4dc8cd..f721b0a 100644
--- a/src/librustdoc/html/static_files.rs --- a/src/librustdoc/html/static_files.rs
+++ b/src/librustdoc/html/static_files.rs +++ b/src/librustdoc/html/static_files.rs
@@ -117,8 +117,6 @@ static_files! { @@ -109,8 +109,6 @@ static_files! {
source_code_pro_semibold => "static/fonts/SourceCodePro-Semibold.ttf.woff2", source_code_pro_semibold => "static/fonts/SourceCodePro-Semibold.ttf.woff2",
source_code_pro_italic => "static/fonts/SourceCodePro-It.ttf.woff2", source_code_pro_italic => "static/fonts/SourceCodePro-It.ttf.woff2",
source_code_pro_license => "static/fonts/SourceCodePro-LICENSE.txt", source_code_pro_license => "static/fonts/SourceCodePro-LICENSE.txt",

4
debian/patches/build/bootstrap-tests-disable-compiler-rt-optimizing.patch vendored
View File

@ -16,10 +16,10 @@ Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
1 file changed, 2 insertions(+) 1 file changed, 2 insertions(+)
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index f768470..e17c614 100644 index e706aba..7c19ff1 100644
--- a/src/bootstrap/src/core/config/config.rs --- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs +++ b/src/bootstrap/src/core/config/config.rs
@@ -1402,6 +1402,8 @@ impl Config { @@ -1433,6 +1433,8 @@ impl Config {
let build = toml.build.get_or_insert_with(Default::default); let build = toml.build.get_or_insert_with(Default::default);
build.rustc = build.rustc.take().or(std::env::var_os("RUSTC").map(|p| p.into())); build.rustc = build.rustc.take().or(std::env::var_os("RUSTC").map(|p| p.into()));
build.cargo = build.cargo.take().or(std::env::var_os("CARGO").map(|p| p.into())); build.cargo = build.cargo.take().or(std::env::var_os("CARGO").map(|p| p.into()));

3
debian/patches/build/ci_rustc-disable-test-that-requires-upstream-git-repo.patch vendored
View File

@ -5,7 +5,6 @@ MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8" Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit Content-Transfer-Encoding: 8bit
Gbp-Pq: Topic build
Forwarded: not-needed Forwarded: not-needed
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email> Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
@ -14,7 +13,7 @@ Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 4fb7cf4..f0ab410 100644 index d6580fe..6ddeacd 100644
--- a/src/bootstrap/src/core/builder/tests.rs --- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs
@@ -212,7 +212,8 @@ fn alias_and_path_for_library() { @@ -212,7 +212,8 @@ fn alias_and_path_for_library() {

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

@ -94,7 +94,7 @@ index 12876e2..09bd221 100644
* Recompiling the crate with different metadata (different name/ * Recompiling the crate with different metadata (different name/
`crate_type`). `crate_type`).
diff --git a/src/doc/edition-guide/book.toml b/src/doc/edition-guide/book.toml diff --git a/src/doc/edition-guide/book.toml b/src/doc/edition-guide/book.toml
index 77867ae..a9b440b 100644 index 998a817..9ca0dc7 100644
--- a/src/doc/edition-guide/book.toml --- a/src/doc/edition-guide/book.toml
+++ b/src/doc/edition-guide/book.toml +++ b/src/doc/edition-guide/book.toml
@@ -55,15 +55,15 @@ search.use-boolean-and = true @@ -55,15 +55,15 @@ search.use-boolean-and = true
@ -121,7 +121,7 @@ index 77867ae..a9b440b 100644
"/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/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/index.html" = "../../../index.html"
"/rust-2018/documentation/new-editions-of-the-book.html" = "../../../book/index.html" "/rust-2018/documentation/new-editions-of-the-book.html" = "../../../book/index.html"
@@ -95,4 +95,4 @@ search.use-boolean-and = true @@ -96,4 +96,4 @@ search.use-boolean-and = true
"/rust-next/future.html" = "../../std/future/trait.Future.html" "/rust-next/future.html" = "../../std/future/trait.Future.html"
"/rust-next/alloc.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#the-alloc-crate-is-stable" "/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/maybe-uninit.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#maybeuninitt-instead-of-memuninitialized"
@ -212,10 +212,10 @@ index 8ad5b42..f93d3da 100644
### The Rustdoc Book ### The Rustdoc Book
diff --git a/src/doc/reference/src/conditional-compilation.md b/src/doc/reference/src/conditional-compilation.md diff --git a/src/doc/reference/src/conditional-compilation.md b/src/doc/reference/src/conditional-compilation.md
index f73f835..8ecc9d3 100644 index 5255bb8..46a477b 100644
--- a/src/doc/reference/src/conditional-compilation.md --- a/src/doc/reference/src/conditional-compilation.md
+++ b/src/doc/reference/src/conditional-compilation.md +++ b/src/doc/reference/src/conditional-compilation.md
@@ -372,6 +372,6 @@ println!("I'm running on a {} machine!", machine_kind); @@ -483,6 +483,6 @@ println!("I'm running on a {} machine!", machine_kind);
[`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute [`target_feature` attribute]: attributes/codegen.md#the-target_feature-attribute
[attribute]: attributes.md [attribute]: attributes.md
[attributes]: attributes.md [attributes]: attributes.md
@ -239,10 +239,10 @@ index 4cd205b..25a7b49 100644
[file an issue]: https://github.com/rust-lang/reference/issues [file an issue]: https://github.com/rust-lang/reference/issues
[lifetime of temporaries]: expressions.html#temporaries [lifetime of temporaries]: expressions.html#temporaries
diff --git a/src/doc/reference/src/linkage.md b/src/doc/reference/src/linkage.md diff --git a/src/doc/reference/src/linkage.md b/src/doc/reference/src/linkage.md
index 48a1c8e..8cf841b 100644 index ff41a14..4d1b72e 100644
--- a/src/doc/reference/src/linkage.md --- a/src/doc/reference/src/linkage.md
+++ b/src/doc/reference/src/linkage.md +++ b/src/doc/reference/src/linkage.md
@@ -216,7 +216,7 @@ fn main() { @@ -242,7 +242,7 @@ fn main() {
} }
``` ```
@ -278,10 +278,10 @@ index ab95aa2..8023f33 100644
If you have dependencies using the `cc` crate, you will need to set these If you have dependencies using the `cc` crate, you will need to set these
environment variables: environment variables:
diff --git a/src/doc/rustc/src/platform-support/fuchsia.md b/src/doc/rustc/src/platform-support/fuchsia.md diff --git a/src/doc/rustc/src/platform-support/fuchsia.md b/src/doc/rustc/src/platform-support/fuchsia.md
index 5643c6a..a3458d8 100644 index 489f46e..8f299a9 100644
--- a/src/doc/rustc/src/platform-support/fuchsia.md --- a/src/doc/rustc/src/platform-support/fuchsia.md
+++ b/src/doc/rustc/src/platform-support/fuchsia.md +++ b/src/doc/rustc/src/platform-support/fuchsia.md
@@ -940,7 +940,7 @@ attach and load any relevant debug symbols. @@ -925,7 +925,7 @@ attach and load any relevant debug symbols.
[Fuchsia]: https://fuchsia.dev/ [Fuchsia]: https://fuchsia.dev/
[source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build [source tree]: https://fuchsia.dev/fuchsia-src/get-started/learn/build
[rustup]: https://rustup.rs/ [rustup]: https://rustup.rs/
@ -339,10 +339,10 @@ index 39a05cf..7e450ae 100644
```bash ```bash
diff --git a/src/doc/unstable-book/src/compiler-flags/branch-protection.md b/src/doc/unstable-book/src/compiler-flags/branch-protection.md diff --git a/src/doc/unstable-book/src/compiler-flags/branch-protection.md b/src/doc/unstable-book/src/compiler-flags/branch-protection.md
index 9276220..0250ab0 100644 index f0cc44a..bf92669 100644
--- a/src/doc/unstable-book/src/compiler-flags/branch-protection.md --- a/src/doc/unstable-book/src/compiler-flags/branch-protection.md
+++ b/src/doc/unstable-book/src/compiler-flags/branch-protection.md +++ b/src/doc/unstable-book/src/compiler-flags/branch-protection.md
@@ -19,4 +19,4 @@ For example, `-Z branch-protection=bti,pac-ret,leaf` is valid, but @@ -20,4 +20,4 @@ For example, `-Z branch-protection=bti,pac-ret,leaf` is valid, but
Rust's standard library does not ship with BTI or pointer authentication enabled by default. 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 In Cargo projects the standard library can be recompiled with pointer authentication using the nightly
@ -362,10 +362,10 @@ index dbb7414..73876b0 100644
For example: For example:
```cmd ```cmd
diff --git a/src/doc/unstable-book/src/compiler-flags/sanitizer.md b/src/doc/unstable-book/src/compiler-flags/sanitizer.md diff --git a/src/doc/unstable-book/src/compiler-flags/sanitizer.md b/src/doc/unstable-book/src/compiler-flags/sanitizer.md
index 24940f0..73446fa 100644 index 4679acf..b6c3eb5 100644
--- a/src/doc/unstable-book/src/compiler-flags/sanitizer.md --- a/src/doc/unstable-book/src/compiler-flags/sanitizer.md
+++ b/src/doc/unstable-book/src/compiler-flags/sanitizer.md +++ b/src/doc/unstable-book/src/compiler-flags/sanitizer.md
@@ -883,7 +883,7 @@ It is strongly recommended to combine sanitizers with recompiled and @@ -882,7 +882,7 @@ It is strongly recommended to combine sanitizers with recompiled and
instrumented standard library, for example using [cargo `-Zbuild-std` instrumented standard library, for example using [cargo `-Zbuild-std`
functionality][build-std]. functionality][build-std].
@ -375,10 +375,10 @@ index 24940f0..73446fa 100644
# Working with other languages # Working with other languages
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index 318d1be..ad881a7 100644 index abaa1d2d7..5a90ea4 100644
--- a/src/tools/linkchecker/main.rs --- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs
@@ -294,6 +294,10 @@ impl Checker { @@ -297,6 +297,10 @@ impl Checker {
return; 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(-) 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
index ecb219e..2b0de1c 100644 index c384fd6..65f42b1 100644
--- a/src/bootstrap/src/lib.rs --- a/src/bootstrap/src/lib.rs
+++ b/src/bootstrap/src/lib.rs +++ b/src/bootstrap/src/lib.rs
@@ -1173,10 +1173,9 @@ Executed at: {executed_at}"#, @@ -1172,10 +1172,9 @@ Executed at: {executed_at}"#,
match which { match which {
GitRepo::Rustc => { GitRepo::Rustc => {

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

@ -8,7 +8,7 @@ Forwarded: not-needed
1 file changed, 3 insertions(+), 2 deletions(-) 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs diff --git a/src/bootstrap/src/utils/channel.rs b/src/bootstrap/src/utils/channel.rs
index c361abb..6a0ab10 100644 index 4a9ecc7..8f98bfa 100644
--- a/src/bootstrap/src/utils/channel.rs --- a/src/bootstrap/src/utils/channel.rs
+++ b/src/bootstrap/src/utils/channel.rs +++ b/src/bootstrap/src/utils/channel.rs
@@ -36,12 +36,13 @@ pub struct Info { @@ -36,12 +36,13 @@ pub struct Info {

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

@ -9,7 +9,7 @@ Forwarded: not-needed
1 file changed, 4 insertions(+) 1 file changed, 4 insertions(+)
diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 695a668..4fb7cf4 100644 index 21c5f72..d6580fe 100644
--- a/src/bootstrap/src/core/builder/tests.rs --- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs +++ b/src/bootstrap/src/core/builder/tests.rs
@@ -435,10 +435,14 @@ mod dist { @@ -435,10 +435,14 @@ mod dist {

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

@ -8,7 +8,7 @@ Forwarded: not-needed
1 file changed, 1 insertion(+) 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 diff --git a/src/bootstrap/src/core/build_steps/dist.rs b/src/bootstrap/src/core/build_steps/dist.rs
index 90e6a10..5f95de2 100644 index 0cb8971..de8b0a4 100644
--- a/src/bootstrap/src/core/build_steps/dist.rs --- a/src/bootstrap/src/core/build_steps/dist.rs
+++ b/src/bootstrap/src/core/build_steps/dist.rs +++ b/src/bootstrap/src/core/build_steps/dist.rs
@@ -79,6 +79,7 @@ impl Step for Docs { @@ -79,6 +79,7 @@ impl Step for Docs {

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

@ -6,14 +6,14 @@ Forwarded: not-needed
=================================================================== ===================================================================
--- ---
src/bootstrap/src/core/builder.rs | 12 ++++++++++++ src/bootstrap/src/core/builder/cargo.rs | 12 ++++++++++++
1 file changed, 12 insertions(+) 1 file changed, 12 insertions(+)
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 48a73a6..6c08222 100644 index e1e19fd..0e53660 100644
--- a/src/bootstrap/src/core/builder.rs --- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -1652,6 +1652,18 @@ impl<'a> Builder<'a> { @@ -625,6 +625,18 @@ impl Builder<'_> {
hostflags.arg("-Zunstable-options"); hostflags.arg("-Zunstable-options");
hostflags.arg("--check-cfg=cfg(bootstrap)"); 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(-) 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 diff --git a/src/bootstrap/src/core/build_steps/doc.rs b/src/bootstrap/src/core/build_steps/doc.rs
index 3d504c3..9b0d967 100644 index 8a9321f..0f5912c 100644
--- a/src/bootstrap/src/core/build_steps/doc.rs --- a/src/bootstrap/src/core/build_steps/doc.rs
+++ b/src/bootstrap/src/core/build_steps/doc.rs +++ b/src/bootstrap/src/core/build_steps/doc.rs
@@ -392,7 +392,27 @@ impl Step for Standalone { @@ -399,7 +399,27 @@ impl Step for Standalone {
.arg("--index-page") .arg("--index-page")
.arg(builder.src.join("src/doc/index.md")) .arg(builder.src.join("src/doc/index.md"))
.arg("--markdown-playground-url") .arg("--markdown-playground-url")
@ -41,7 +41,7 @@ index 3d504c3..9b0d967 100644
.arg("-o") .arg("-o")
.arg(&out) .arg(&out)
.arg(&path); .arg(&path);
@@ -401,11 +421,6 @@ impl Step for Standalone { @@ -408,11 +428,6 @@ impl Step for Standalone {
cmd.arg("--disable-minification"); cmd.arg("--disable-minification");
} }

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

@ -17,7 +17,7 @@ Signed-off-by: Fabian Grünbichler <debian@fabian.gruenbichler.email>
1 file changed, 6 insertions(+) 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 diff --git a/src/tools/cargo/tests/testsuite/build_script.rs b/src/tools/cargo/tests/testsuite/build_script.rs
index e9fda1d..bd08ab5 100644 index 897a0b4..980b955 100644
--- a/src/tools/cargo/tests/testsuite/build_script.rs --- a/src/tools/cargo/tests/testsuite/build_script.rs
+++ b/src/tools/cargo/tests/testsuite/build_script.rs +++ b/src/tools/cargo/tests/testsuite/build_script.rs
@@ -736,6 +736,9 @@ fn custom_build_linker_bad_host_with_arch() { @@ -736,6 +736,9 @@ fn custom_build_linker_bad_host_with_arch() {

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

@ -7,11 +7,11 @@ Forwarded: TODO
.../cargo/tests/testsuite/credential_process.rs | 14 +-- .../cargo/tests/testsuite/credential_process.rs | 14 +--
src/tools/cargo/tests/testsuite/git_auth.rs | 4 +- src/tools/cargo/tests/testsuite/git_auth.rs | 4 +-
src/tools/cargo/tests/testsuite/net_config.rs | 4 +- src/tools/cargo/tests/testsuite/net_config.rs | 4 +-
src/tools/cargo/tests/testsuite/publish.rs | 110 ++++++++++----------- src/tools/cargo/tests/testsuite/publish.rs | 113 +++++++++++----------
4 files changed, 66 insertions(+), 66 deletions(-) 4 files changed, 68 insertions(+), 67 deletions(-)
diff --git a/src/tools/cargo/tests/testsuite/credential_process.rs b/src/tools/cargo/tests/testsuite/credential_process.rs diff --git a/src/tools/cargo/tests/testsuite/credential_process.rs b/src/tools/cargo/tests/testsuite/credential_process.rs
index 391cdb3..fcf1a6f 100644 index 130ca88..ab94fae 100644
--- a/src/tools/cargo/tests/testsuite/credential_process.rs --- a/src/tools/cargo/tests/testsuite/credential_process.rs
+++ b/src/tools/cargo/tests/testsuite/credential_process.rs +++ b/src/tools/cargo/tests/testsuite/credential_process.rs
@@ -65,7 +65,7 @@ fn get_token_test() -> (Project, TestRegistry) { @@ -65,7 +65,7 @@ fn get_token_test() -> (Project, TestRegistry) {
@ -78,7 +78,7 @@ index 391cdb3..fcf1a6f 100644
// Error when credential process does not output the expected format for a token. // Error when credential process does not output the expected format for a token.
let cred_proj = project() let cred_proj = project()
diff --git a/src/tools/cargo/tests/testsuite/git_auth.rs b/src/tools/cargo/tests/testsuite/git_auth.rs diff --git a/src/tools/cargo/tests/testsuite/git_auth.rs b/src/tools/cargo/tests/testsuite/git_auth.rs
index 0e52e14..3e18360 100644 index c5fb553..99e9405 100644
--- a/src/tools/cargo/tests/testsuite/git_auth.rs --- a/src/tools/cargo/tests/testsuite/git_auth.rs
+++ b/src/tools/cargo/tests/testsuite/git_auth.rs +++ b/src/tools/cargo/tests/testsuite/git_auth.rs
@@ -105,7 +105,7 @@ fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc<AtomicUsize>) { @@ -105,7 +105,7 @@ fn setup_failed_auth_test() -> (SocketAddr, JoinHandle<()>, Arc<AtomicUsize>) {
@ -122,7 +122,7 @@ index b765678..ed695bd 100644
let p = project() let p = project()
.file( .file(
diff --git a/src/tools/cargo/tests/testsuite/publish.rs b/src/tools/cargo/tests/testsuite/publish.rs diff --git a/src/tools/cargo/tests/testsuite/publish.rs b/src/tools/cargo/tests/testsuite/publish.rs
index 7771296..2f681d9 100644 index 403473e..d94a0fa 100644
--- a/src/tools/cargo/tests/testsuite/publish.rs --- a/src/tools/cargo/tests/testsuite/publish.rs
+++ b/src/tools/cargo/tests/testsuite/publish.rs +++ b/src/tools/cargo/tests/testsuite/publish.rs
@@ -90,7 +90,7 @@ fn validate_upload_li() { @@ -90,7 +90,7 @@ fn validate_upload_li() {
@ -368,16 +368,17 @@ index 7771296..2f681d9 100644
fn publish_with_patch() { fn publish_with_patch() {
let registry = RegistryBuilder::new().http_api().http_index().build(); let registry = RegistryBuilder::new().http_api().http_index().build();
Package::new("bar", "1.0.0").publish(); Package::new("bar", "1.0.0").publish();
@@ -1386,7 +1386,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -1385,7 +1385,8 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
);
} }
#[expect(deprecated)]
-#[cargo_test] -#[cargo_test]
+#[expect(deprecated)]
+#[allow(dead_code)] +#[allow(dead_code)]
fn publish_checks_for_token_before_verify() { fn publish_checks_for_token_before_verify() {
let registry = registry::RegistryBuilder::new() let registry = registry::RegistryBuilder::new()
.no_configure_token() .no_configure_token()
@@ -1440,7 +1440,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for @@ -1439,7 +1440,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
.run(); .run();
} }
@ -386,7 +387,7 @@ index 7771296..2f681d9 100644
fn publish_with_bad_source() { fn publish_with_bad_source() {
let p = project() let p = project()
.file( .file(
@@ -1487,7 +1487,7 @@ include `--registry crates-io` to use crates.io @@ -1486,7 +1487,7 @@ include `--registry crates-io` to use crates.io
} }
// A dependency with both `git` and `version`. // A dependency with both `git` and `version`.
@ -395,7 +396,7 @@ index 7771296..2f681d9 100644
fn publish_git_with_version() { fn publish_git_with_version() {
let registry = RegistryBuilder::new().http_api().http_index().build(); let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -1646,7 +1646,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -1656,7 +1657,7 @@ dependencies = [
); );
} }
@ -404,7 +405,7 @@ index 7771296..2f681d9 100644
fn publish_dev_dep_stripping() { fn publish_dev_dep_stripping() {
let registry = RegistryBuilder::new().http_api().http_index().build(); let registry = RegistryBuilder::new().http_api().http_index().build();
Package::new("normal-only", "1.0.0") Package::new("normal-only", "1.0.0")
@@ -2073,7 +2073,7 @@ features = ["cat"] @@ -2092,7 +2093,7 @@ features = ["cat"]
); );
} }
@ -413,7 +414,7 @@ index 7771296..2f681d9 100644
fn credentials_ambiguous_filename() { fn credentials_ambiguous_filename() {
// `publish` generally requires a remote registry // `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build(); let registry = registry::RegistryBuilder::new().http_api().build();
@@ -2133,7 +2133,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -2152,7 +2153,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
// --index will not load registry.token to avoid possibly leaking // --index will not load registry.token to avoid possibly leaking
// crates.io token to another server. // crates.io token to another server.
@ -422,7 +423,7 @@ index 7771296..2f681d9 100644
fn index_requires_token() { fn index_requires_token() {
// Use local registry for faster test times since no publish will occur // Use local registry for faster test times since no publish will occur
let registry = registry::init(); let registry = registry::init();
@@ -2168,7 +2168,7 @@ fn index_requires_token() { @@ -2187,7 +2188,7 @@ fn index_requires_token() {
} }
// publish with source replacement without --registry // publish with source replacement without --registry
@ -431,7 +432,7 @@ index 7771296..2f681d9 100644
fn cratesio_source_replacement() { fn cratesio_source_replacement() {
registry::init(); registry::init();
let p = project() let p = project()
@@ -2198,7 +2198,7 @@ include `--registry dummy-registry` or `--registry crates-io` @@ -2217,7 +2218,7 @@ include `--registry dummy-registry` or `--registry crates-io`
} }
// Registry returns an API error. // Registry returns an API error.
@ -440,7 +441,7 @@ index 7771296..2f681d9 100644
fn api_error_json() { fn api_error_json() {
let _registry = registry::RegistryBuilder::new() let _registry = registry::RegistryBuilder::new()
.alternative() .alternative()
@@ -2246,7 +2246,7 @@ Caused by: @@ -2265,7 +2266,7 @@ Caused by:
} }
// Registry returns an API error with a 200 status code. // Registry returns an API error with a 200 status code.
@ -449,7 +450,7 @@ index 7771296..2f681d9 100644
fn api_error_200() { fn api_error_200() {
let _registry = registry::RegistryBuilder::new() let _registry = registry::RegistryBuilder::new()
.alternative() .alternative()
@@ -2294,7 +2294,7 @@ Caused by: @@ -2313,7 +2314,7 @@ Caused by:
} }
// Registry returns an error code without a JSON message. // Registry returns an error code without a JSON message.
@ -458,7 +459,7 @@ index 7771296..2f681d9 100644
fn api_error_code() { fn api_error_code() {
let _registry = registry::RegistryBuilder::new() let _registry = registry::RegistryBuilder::new()
.alternative() .alternative()
@@ -2349,7 +2349,7 @@ Caused by: @@ -2368,7 +2369,7 @@ Caused by:
} }
// Registry has a network error. // Registry has a network error.
@ -467,7 +468,7 @@ index 7771296..2f681d9 100644
fn api_curl_error() { fn api_curl_error() {
let _registry = registry::RegistryBuilder::new() let _registry = registry::RegistryBuilder::new()
.alternative() .alternative()
@@ -2399,7 +2399,7 @@ Caused by: @@ -2418,7 +2419,7 @@ Caused by:
} }
// Registry returns an invalid response. // Registry returns an invalid response.
@ -476,7 +477,7 @@ index 7771296..2f681d9 100644
fn api_other_error() { fn api_other_error() {
let _registry = registry::RegistryBuilder::new() let _registry = registry::RegistryBuilder::new()
.alternative() .alternative()
@@ -2449,7 +2449,7 @@ Caused by: @@ -2468,7 +2469,7 @@ Caused by:
.run(); .run();
} }
@ -485,7 +486,7 @@ index 7771296..2f681d9 100644
fn in_package_workspace() { fn in_package_workspace() {
let registry = RegistryBuilder::new().http_api().http_index().build(); let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -2501,7 +2501,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -2520,7 +2521,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
validate_upload_li(); validate_upload_li();
} }
@ -494,7 +495,7 @@ index 7771296..2f681d9 100644
fn with_duplicate_spec_in_members() { fn with_duplicate_spec_in_members() {
// Use local registry for faster test times since no publish will occur // Use local registry for faster test times since no publish will occur
let registry = registry::init(); let registry = registry::init();
@@ -2557,7 +2557,7 @@ fn with_duplicate_spec_in_members() { @@ -2576,7 +2577,7 @@ fn with_duplicate_spec_in_members() {
.run(); .run();
} }
@ -503,7 +504,7 @@ index 7771296..2f681d9 100644
fn in_package_workspace_with_members_with_features_old() { fn in_package_workspace_with_members_with_features_old() {
let registry = RegistryBuilder::new().http_api().http_index().build(); let registry = RegistryBuilder::new().http_api().http_index().build();
@@ -2609,7 +2609,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -2628,7 +2629,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
validate_upload_li(); validate_upload_li();
} }
@ -512,7 +513,7 @@ index 7771296..2f681d9 100644
fn in_virtual_workspace() { fn in_virtual_workspace() {
// Use local registry for faster test times since no publish will occur // Use local registry for faster test times since no publish will occur
let registry = registry::init(); let registry = registry::init();
@@ -2647,7 +2647,7 @@ fn in_virtual_workspace() { @@ -2666,7 +2667,7 @@ fn in_virtual_workspace() {
.run(); .run();
} }
@ -521,7 +522,7 @@ index 7771296..2f681d9 100644
fn in_virtual_workspace_with_p() { fn in_virtual_workspace_with_p() {
// `publish` generally requires a remote registry // `publish` generally requires a remote registry
let registry = registry::RegistryBuilder::new().http_api().build(); let registry = registry::RegistryBuilder::new().http_api().build();
@@ -2706,7 +2706,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -2725,7 +2726,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
.run(); .run();
} }
@ -530,7 +531,7 @@ index 7771296..2f681d9 100644
fn in_package_workspace_not_found() { fn in_package_workspace_not_found() {
// Use local registry for faster test times since no publish will occur // Use local registry for faster test times since no publish will occur
let registry = registry::init(); let registry = registry::init();
@@ -2750,7 +2750,7 @@ fn in_package_workspace_not_found() { @@ -2769,7 +2770,7 @@ fn in_package_workspace_not_found() {
.run(); .run();
} }
@ -539,7 +540,7 @@ index 7771296..2f681d9 100644
fn in_package_workspace_found_multiple() { fn in_package_workspace_found_multiple() {
// Use local registry for faster test times since no publish will occur // Use local registry for faster test times since no publish will occur
let registry = registry::init(); let registry = registry::init();
@@ -2806,7 +2806,7 @@ fn in_package_workspace_found_multiple() { @@ -2825,7 +2826,7 @@ fn in_package_workspace_found_multiple() {
.run(); .run();
} }
@ -548,7 +549,7 @@ index 7771296..2f681d9 100644
// https://github.com/rust-lang/cargo/issues/10536 // https://github.com/rust-lang/cargo/issues/10536
fn publish_path_dependency_without_workspace() { fn publish_path_dependency_without_workspace() {
// Use local registry for faster test times since no publish will occur // Use local registry for faster test times since no publish will occur
@@ -2852,7 +2852,7 @@ fn publish_path_dependency_without_workspace() { @@ -2871,7 +2872,7 @@ fn publish_path_dependency_without_workspace() {
.run(); .run();
} }
@ -557,7 +558,7 @@ index 7771296..2f681d9 100644
fn http_api_not_noop() { fn http_api_not_noop() {
let registry = registry::RegistryBuilder::new().http_api().build(); let registry = registry::RegistryBuilder::new().http_api().build();
@@ -2914,7 +2914,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -2933,7 +2934,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("build").run(); p.cargo("build").run();
} }
@ -566,7 +567,7 @@ index 7771296..2f681d9 100644
fn wait_for_first_publish() { fn wait_for_first_publish() {
// Counter for number of tries before the package is "published" // Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
@@ -2997,7 +2997,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -3016,7 +3017,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 /// A separate test is needed for package names with - or _ as they hit
/// the responder twice per cargo invocation. If that ever gets changed /// the responder twice per cargo invocation. If that ever gets changed
/// this test will need to be changed accordingly. /// this test will need to be changed accordingly.
@ -575,7 +576,7 @@ index 7771296..2f681d9 100644
fn wait_for_first_publish_underscore() { fn wait_for_first_publish_underscore() {
// Counter for number of tries before the package is "published" // Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
@@ -3094,7 +3094,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -3113,7 +3114,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("build").with_status(0).run(); p.cargo("build").with_status(0).run();
} }
@ -584,7 +585,7 @@ index 7771296..2f681d9 100644
fn wait_for_subsequent_publish() { fn wait_for_subsequent_publish() {
// Counter for number of tries before the package is "published" // Counter for number of tries before the package is "published"
let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0)); let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
@@ -3187,7 +3187,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -3206,7 +3207,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
p.cargo("check").with_status(0).run(); p.cargo("check").with_status(0).run();
} }
@ -593,7 +594,7 @@ index 7771296..2f681d9 100644
fn skip_wait_for_publish() { fn skip_wait_for_publish() {
// Intentionally using local registry so the crate never makes it to the index // Intentionally using local registry so the crate never makes it to the index
let registry = registry::init(); let registry = registry::init();
@@ -3231,7 +3231,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for @@ -3250,7 +3251,7 @@ See https://doc.rust-lang.org/cargo/reference/manifest.html#package-metadata for
.run(); .run();
} }
@ -602,7 +603,7 @@ index 7771296..2f681d9 100644
fn timeout_waiting_for_publish() { fn timeout_waiting_for_publish() {
// Publish doesn't happen within the timeout window. // Publish doesn't happen within the timeout window.
let registry = registry::RegistryBuilder::new() let registry = registry::RegistryBuilder::new()
@@ -3283,7 +3283,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -3302,7 +3303,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
.run(); .run();
} }
@ -611,7 +612,16 @@ index 7771296..2f681d9 100644
fn timeout_waiting_for_dependency_publish() { fn timeout_waiting_for_dependency_publish() {
// Publish doesn't happen within the timeout window. // Publish doesn't happen within the timeout window.
let registry = registry::RegistryBuilder::new() let registry = registry::RegistryBuilder::new()
@@ -3383,7 +3383,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly. @@ -3402,7 +3403,7 @@ You may press ctrl-c to skip waiting; the crate should be available shortly.
.run();
}
-#[cargo_test]
+#[allow(dead_code)]
fn package_selection() {
let registry = registry::RegistryBuilder::new().http_api().build();
let p = project()
@@ -3516,7 +3517,7 @@ See https://github.com/rust-lang/cargo/issues/10948 for more information about t
.run(); .run();
} }

2
debian/patches/cargo/c-2200-workaround-x32-test.patch vendored
View File

@ -8,7 +8,7 @@ Bug: https://github.com/rust-lang/cargo/issues/10005
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/cargo/tests/testsuite/cfg.rs b/src/tools/cargo/tests/testsuite/cfg.rs diff --git a/src/tools/cargo/tests/testsuite/cfg.rs b/src/tools/cargo/tests/testsuite/cfg.rs
index 0b71e86..92f41b3 100644 index 7e90b51..71456d4 100644
--- a/src/tools/cargo/tests/testsuite/cfg.rs --- a/src/tools/cargo/tests/testsuite/cfg.rs
+++ b/src/tools/cargo/tests/testsuite/cfg.rs +++ b/src/tools/cargo/tests/testsuite/cfg.rs
@@ -280,7 +280,7 @@ fn any_ok() { @@ -280,7 +280,7 @@ fn any_ok() {

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(-) 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 diff --git a/src/tools/cargo/src/cargo/core/features.rs b/src/tools/cargo/src/cargo/core/features.rs
index 2638ff9..ebe78df 100644 index 8bce515..32524e5 100644
--- a/src/tools/cargo/src/cargo/core/features.rs --- a/src/tools/cargo/src/cargo/core/features.rs
+++ b/src/tools/cargo/src/cargo/core/features.rs +++ b/src/tools/cargo/src/cargo/core/features.rs
@@ -1396,9 +1396,8 @@ pub fn channel() -> String { @@ -1401,9 +1401,8 @@ pub fn channel() -> String {
return "dev".to_string(); return "dev".to_string();
} }
} }

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

@ -9,17 +9,17 @@ Forwarded: not-needed
--- ---
Cargo.toml | 6 ------ Cargo.toml | 6 ------
src/bootstrap/bootstrap.py | 4 ---- src/bootstrap/bootstrap.py | 4 ----
src/bootstrap/src/core/build_steps/test.rs | 10 +-------- src/bootstrap/src/core/build_steps/test.rs | 10 +---------
src/bootstrap/src/core/builder.rs | 33 +----------------------------- src/bootstrap/src/core/builder/cargo.rs | 5 +----
src/tools/build_helper/src/util.rs | 21 +------------------ src/bootstrap/src/core/builder/mod.rs | 23 -----------------------
src/tools/rust-analyzer/Cargo.toml | 11 +++++++++- src/build_helper/src/util.rs | 21 +--------------------
6 files changed, 13 insertions(+), 72 deletions(-) 6 files changed, 3 insertions(+), 66 deletions(-)
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index d4b8425..7610ad1 100644 index b773030..7d9b7ba 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -18,21 +18,15 @@ members = [ @@ -21,21 +21,15 @@ members = [
"src/tools/tidy", "src/tools/tidy",
"src/tools/tier-check", "src/tools/tier-check",
"src/tools/build-manifest", "src/tools/build-manifest",
@ -42,7 +42,7 @@ index d4b8425..7610ad1 100644
"src/tools/lld-wrapper", "src/tools/lld-wrapper",
"src/tools/collect-license-metadata", "src/tools/collect-license-metadata",
diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
index 04909cd..7a062df 100644 index d7ae029..07b073d 100644
--- a/src/bootstrap/bootstrap.py --- a/src/bootstrap/bootstrap.py
+++ b/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py
@@ -1031,10 +1031,6 @@ class RustBuild(object): @@ -1031,10 +1031,6 @@ class RustBuild(object):
@ -57,10 +57,10 @@ index 04909cd..7a062df 100644
args.append("--features") args.append("--features")
args.append("build-metrics") args.append("build-metrics")
diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs diff --git a/src/bootstrap/src/core/build_steps/test.rs b/src/bootstrap/src/core/build_steps/test.rs
index e25b571..faa752b 100644 index dcea9f5..1a8e187 100644
--- a/src/bootstrap/src/core/build_steps/test.rs --- a/src/bootstrap/src/core/build_steps/test.rs
+++ b/src/bootstrap/src/core/build_steps/test.rs +++ b/src/bootstrap/src/core/build_steps/test.rs
@@ -2429,15 +2429,7 @@ impl Step for RustcGuide { @@ -2443,15 +2443,7 @@ impl Step for RustcGuide {
} }
fn run(self, builder: &Builder<'_>) { fn run(self, builder: &Builder<'_>) {
@ -77,11 +77,27 @@ index e25b571..faa752b 100644
} }
} }
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs diff --git a/src/bootstrap/src/core/builder/cargo.rs b/src/bootstrap/src/core/builder/cargo.rs
index 9ac0b0a..48a73a6 100644 index 0688a1d..e1e19fd 100644
--- a/src/bootstrap/src/core/builder.rs --- a/src/bootstrap/src/core/builder/cargo.rs
+++ b/src/bootstrap/src/core/builder.rs +++ b/src/bootstrap/src/core/builder/cargo.rs
@@ -791,26 +791,13 @@ impl<'a> Builder<'a> { @@ -1131,10 +1131,7 @@ impl Builder<'_> {
}
}
- if self.config.locked_deps {
- cargo.arg("--locked");
- }
- if self.config.vendor || self.is_sudo {
+ if self.is_sudo {
cargo.arg("--frozen");
}
diff --git a/src/bootstrap/src/core/builder/mod.rs b/src/bootstrap/src/core/builder/mod.rs
index d59e0fa..927abe6 100644
--- a/src/bootstrap/src/core/builder/mod.rs
+++ b/src/bootstrap/src/core/builder/mod.rs
@@ -787,26 +787,14 @@ impl<'a> Builder<'a> {
tool::Linkchecker, tool::Linkchecker,
tool::CargoTest, tool::CargoTest,
tool::Compiletest, tool::Compiletest,
@ -90,7 +106,7 @@ index 9ac0b0a..48a73a6 100644
tool::RustInstaller, tool::RustInstaller,
tool::Cargo, tool::Cargo,
- tool::Rls, - tool::Rls,
- tool::RustAnalyzer, tool::RustAnalyzer,
tool::RustAnalyzerProcMacroSrv, tool::RustAnalyzerProcMacroSrv,
tool::Rustdoc, tool::Rustdoc,
tool::Clippy, tool::Clippy,
@ -108,7 +124,7 @@ index 9ac0b0a..48a73a6 100644
tool::OptimizedDist, tool::OptimizedDist,
tool::CoverageDump, tool::CoverageDump,
tool::LlvmBitcodeLinker, tool::LlvmBitcodeLinker,
@@ -850,12 +837,7 @@ impl<'a> Builder<'a> { @@ -847,10 +835,6 @@ impl<'a> Builder<'a> {
check::Rustdoc, check::Rustdoc,
check::CodegenBackend, check::CodegenBackend,
check::Clippy, check::Clippy,
@ -117,19 +133,9 @@ index 9ac0b0a..48a73a6 100644
- check::MiroptTestTools, - check::MiroptTestTools,
- check::Rls, - check::Rls,
check::Rustfmt, check::Rustfmt,
- check::RustAnalyzer, check::RustAnalyzer,
check::TestFloatParse, check::TestFloatParse,
check::Bootstrap, @@ -900,8 +884,6 @@ impl<'a> Builder<'a> {
),
@@ -888,7 +870,6 @@ impl<'a> Builder<'a> {
test::TierCheck,
test::Cargotest,
test::Cargo,
- test::RustAnalyzer,
test::ErrorIndex,
test::Distcheck,
test::Nomicon,
@@ -903,8 +884,6 @@ impl<'a> Builder<'a> {
test::EmbeddedBook, test::EmbeddedBook,
test::EditionGuide, test::EditionGuide,
test::Rustfmt, test::Rustfmt,
@ -138,7 +144,7 @@ index 9ac0b0a..48a73a6 100644
test::Clippy, test::Clippy,
test::CompiletestTest, test::CompiletestTest,
test::CrateRunMakeSupport, test::CrateRunMakeSupport,
@@ -944,7 +923,6 @@ impl<'a> Builder<'a> { @@ -941,7 +923,6 @@ impl<'a> Builder<'a> {
doc::CargoBook, doc::CargoBook,
doc::Clippy, doc::Clippy,
doc::ClippyBook, doc::ClippyBook,
@ -146,30 +152,27 @@ index 9ac0b0a..48a73a6 100644
doc::EmbeddedBook, doc::EmbeddedBook,
doc::EditionGuide, doc::EditionGuide,
doc::StyleGuide, doc::StyleGuide,
@@ -967,11 +945,8 @@ impl<'a> Builder<'a> { @@ -964,11 +945,9 @@ impl<'a> Builder<'a> {
dist::Analysis, dist::Analysis,
dist::Src, dist::Src,
dist::Cargo, dist::Cargo,
- dist::Rls, - dist::Rls,
- dist::RustAnalyzer, dist::RustAnalyzer,
dist::Rustfmt, dist::Rustfmt,
dist::Clippy, dist::Clippy,
- dist::Miri, - dist::Miri,
dist::LlvmTools, dist::LlvmTools,
dist::LlvmBitcodeLinker, dist::LlvmBitcodeLinker,
dist::RustDev, dist::RustDev,
@@ -994,10 +969,8 @@ impl<'a> Builder<'a> { @@ -994,7 +973,6 @@ impl<'a> Builder<'a> {
// install the same binaries twice for each tool, leaving backup files (*.old) as a result. install::RustAnalyzer,
install::Rustc,
install::Cargo,
- install::RustAnalyzer,
install::Rustfmt, install::Rustfmt,
install::Clippy, install::Clippy,
- install::Miri, - install::Miri,
install::LlvmTools, install::LlvmTools,
install::Src, install::Src,
), ),
@@ -1005,7 +978,6 @@ impl<'a> Builder<'a> { @@ -1002,7 +980,6 @@ impl<'a> Builder<'a> {
run::BuildManifest, run::BuildManifest,
run::BumpStage0, run::BumpStage0,
run::ReplaceVersionPlaceholder, run::ReplaceVersionPlaceholder,
@ -177,22 +180,10 @@ index 9ac0b0a..48a73a6 100644
run::CollectLicenseMetadata, run::CollectLicenseMetadata,
run::GenerateCopyright, run::GenerateCopyright,
run::GenerateWindowsSys, run::GenerateWindowsSys,
@@ -2186,10 +2158,7 @@ impl<'a> Builder<'a> { diff --git a/src/build_helper/src/util.rs b/src/build_helper/src/util.rs
}
}
- if self.config.locked_deps {
- cargo.arg("--locked");
- }
- if self.config.vendor || self.is_sudo {
+ if self.is_sudo {
cargo.arg("--frozen");
}
diff --git a/src/tools/build_helper/src/util.rs b/src/tools/build_helper/src/util.rs
index 72c05c4..3be35b7 100644 index 72c05c4..3be35b7 100644
--- a/src/tools/build_helper/src/util.rs --- a/src/build_helper/src/util.rs
+++ b/src/tools/build_helper/src/util.rs +++ b/src/build_helper/src/util.rs
@@ -52,24 +52,5 @@ pub fn try_run(cmd: &mut Command, print_cmd_on_fail: bool) -> Result<(), ()> { @@ -52,24 +52,5 @@ pub fn try_run(cmd: &mut Command, print_cmd_on_fail: bool) -> Result<(), ()> {
/// Returns the submodule paths from the `.gitmodules` file in the given directory. /// Returns the submodule paths from the `.gitmodules` file in the given directory.
@ -219,23 +210,3 @@ index 72c05c4..3be35b7 100644
- SUBMODULES_PATHS.get_or_init(|| init_submodules_paths()) - SUBMODULES_PATHS.get_or_init(|| init_submodules_paths())
+ return &[]; + return &[];
} }
diff --git a/src/tools/rust-analyzer/Cargo.toml b/src/tools/rust-analyzer/Cargo.toml
index 0b3d6e2..40c0f98 100644
--- a/src/tools/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/Cargo.toml
@@ -1,5 +1,14 @@
[workspace]
-members = ["xtask/", "lib/*", "crates/*"]
+members = [
+ "xtask/",
+ "lib/*",
+ "crates/proc-macro-srv",
+ "crates/proc-macro-srv-cli",
+ "crates/tt",
+ "crates/mbe",
+ "crates/paths",
+ "crates/proc-macro-api",
+]
exclude = ["crates/proc-macro-srv/proc-macro-test/imp"]
resolver = "2"

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

@ -8,18 +8,19 @@ in debian/rust-doc.links
Forwarded: not-needed Forwarded: not-needed
--- ---
src/doc/rust-by-example/theme/index.hbs | 86 +---------------- src/doc/rust-by-example/theme/index.hbs | 83 +---------------
src/tools/linkchecker/main.rs | 28 +++++- src/tools/linkchecker/main.rs | 28 +++++-
vendor/mdbook-0.4.40/src/book/init.rs | 19 ---- vendor/mdbook-0.4.42/src/book/init.rs | 19 ----
.../src/renderer/html_handlebars/hbs_renderer.rs | 104 ++++----------------- .../src/renderer/html_handlebars/hbs_renderer.rs | 104 ++++-----------------
.../src/renderer/html_handlebars/search.rs | 2 - .../src/renderer/html_handlebars/search.rs | 2 -
vendor/mdbook-0.4.40/src/theme/index.hbs | 86 +---------------- vendor/mdbook-0.4.42/src/theme/index.hbs | 57 +----------
vendor/mdbook-0.4.40/src/theme/mod.rs | 27 ------ vendor/mdbook-0.4.42/src/theme/mod.rs | 27 ------
vendor/mdbook-0.4.40/src/theme/searcher/mod.rs | 2 - vendor/mdbook-0.4.42/src/theme/searcher/mod.rs | 2 -
8 files changed, 51 insertions(+), 303 deletions(-) vendor/mdbook-0.4.42/src/theme/toc.html.hbs | 3 +-
9 files changed, 52 insertions(+), 273 deletions(-)
diff --git a/src/doc/rust-by-example/theme/index.hbs b/src/doc/rust-by-example/theme/index.hbs diff --git a/src/doc/rust-by-example/theme/index.hbs b/src/doc/rust-by-example/theme/index.hbs
index 4723667..a358f8c 100644 index 960f541..830fd29 100644
--- a/src/doc/rust-by-example/theme/index.hbs --- a/src/doc/rust-by-example/theme/index.hbs
+++ b/src/doc/rust-by-example/theme/index.hbs +++ b/src/doc/rust-by-example/theme/index.hbs
@@ -33,10 +33,7 @@ @@ -33,10 +33,7 @@
@ -41,12 +42,12 @@ index 4723667..a358f8c 100644
- <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> - <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> + <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
{{/if}} {{/if}}
</head>
<body class="sidebar-visible no-js">
@@ -61,35 +58,6 @@
var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
</script>
<!-- Provide site root to javascript -->
@@ -63,32 +60,6 @@
</head>
<body>
<div id="body-container">
- <!-- Work around some values being stored in localStorage wrapped in quotes --> - <!-- Work around some values being stored in localStorage wrapped in quotes -->
- <script> - <script>
- try { - try {
@ -68,18 +69,15 @@ index 4723667..a358f8c 100644
- var theme; - var theme;
- try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { } - try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
- if (theme === null || theme === undefined) { theme = default_theme; } - if (theme === null || theme === undefined) { theme = default_theme; }
- var html = document.querySelector('html'); - const html = document.documentElement;
- html.classList.remove('{{ default_theme }}') - html.classList.remove('{{ default_theme }}')
- html.classList.add(theme); - html.classList.add(theme);
- var body = document.querySelector('body'); - html.classList.add("js");
- body.classList.remove('no-js')
- body.classList.add('js');
- </script> - </script>
-
<input type="checkbox" id="sidebar-toggle-anchor" class="hidden"> <input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
<!-- Hide / unhide sidebar before it is displayed --> @@ -296,54 +267,8 @@
@@ -315,54 +283,8 @@
</script> </script>
{{/if}} {{/if}}
@ -137,10 +135,10 @@ index 4723667..a358f8c 100644
<!-- Custom JS scripts --> <!-- Custom JS scripts -->
{{#each additional_js}} {{#each additional_js}}
diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
index fa77ab1..318d1be 100644 index 833e41d..abaa1d2d7 100644
--- a/src/tools/linkchecker/main.rs --- a/src/tools/linkchecker/main.rs
+++ b/src/tools/linkchecker/main.rs +++ b/src/tools/linkchecker/main.rs
@@ -168,7 +168,17 @@ impl Checker { @@ -171,7 +171,17 @@ impl Checker {
for entry in t!(dir.read_dir()).map(|e| t!(e)) { for entry in t!(dir.read_dir()).map(|e| t!(e)) {
let path = entry.path(); let path = entry.path();
// Goes through symlinks // Goes through symlinks
@ -159,7 +157,7 @@ index fa77ab1..318d1be 100644
if metadata.is_dir() { if metadata.is_dir() {
self.walk(&path, report); self.walk(&path, report);
} else { } else {
@@ -181,7 +191,15 @@ impl Checker { @@ -184,7 +194,15 @@ impl Checker {
fn check(&mut self, file: &Path, report: &mut Report) { fn check(&mut self, file: &Path, report: &mut Report) {
let (pretty_path, entry) = self.load_file(file, report); let (pretty_path, entry) = self.load_file(file, report);
let source = match entry { let source = match entry {
@ -176,7 +174,7 @@ index fa77ab1..318d1be 100644
FileEntry::Dir => unreachable!("never with `check` path"), FileEntry::Dir => unreachable!("never with `check` path"),
FileEntry::OtherFile => return, FileEntry::OtherFile => return,
FileEntry::Redirect { .. } => return, FileEntry::Redirect { .. } => return,
@@ -270,6 +288,12 @@ impl Checker { @@ -273,6 +291,12 @@ impl Checker {
let (target_pretty_path, target_entry) = self.load_file(&path, report); let (target_pretty_path, target_entry) = self.load_file(&path, report);
let (target_source, target_ids) = match target_entry { let (target_source, target_ids) = match target_entry {
FileEntry::Missing => { FileEntry::Missing => {
@ -189,10 +187,10 @@ index fa77ab1..318d1be 100644
if is_exception(file, &target_pretty_path) { if is_exception(file, &target_pretty_path) {
report.links_ignored_exception += 1; report.links_ignored_exception += 1;
} else { } else {
diff --git a/vendor/mdbook-0.4.40/src/book/init.rs b/vendor/mdbook-0.4.40/src/book/init.rs diff --git a/vendor/mdbook-0.4.42/src/book/init.rs b/vendor/mdbook-0.4.42/src/book/init.rs
index faca1d0..c1a82a3 100644 index faca1d0..c1a82a3 100644
--- a/vendor/mdbook-0.4.40/src/book/init.rs --- a/vendor/mdbook-0.4.42/src/book/init.rs
+++ b/vendor/mdbook-0.4.40/src/book/init.rs +++ b/vendor/mdbook-0.4.42/src/book/init.rs
@@ -153,25 +153,6 @@ impl BookBuilder { @@ -153,25 +153,6 @@ impl BookBuilder {
let mut js = File::create(themedir.join("book.js"))?; let mut js = File::create(themedir.join("book.js"))?;
js.write_all(theme::JS)?; js.write_all(theme::JS)?;
@ -219,10 +217,10 @@ index faca1d0..c1a82a3 100644
Ok(()) Ok(())
} }
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 diff --git a/vendor/mdbook-0.4.42/src/renderer/html_handlebars/hbs_renderer.rs b/vendor/mdbook-0.4.42/src/renderer/html_handlebars/hbs_renderer.rs
index d304259..c89eaea 100644 index d0149fb..06ea0b4 100644
--- a/vendor/mdbook-0.4.40/src/renderer/html_handlebars/hbs_renderer.rs --- a/vendor/mdbook-0.4.42/src/renderer/html_handlebars/hbs_renderer.rs
+++ b/vendor/mdbook-0.4.40/src/renderer/html_handlebars/hbs_renderer.rs +++ b/vendor/mdbook-0.4.42/src/renderer/html_handlebars/hbs_renderer.rs
@@ -3,13 +3,14 @@ use crate::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEditio @@ -3,13 +3,14 @@ use crate::config::{BookConfig, Code, Config, HtmlConfig, Playground, RustEditio
use crate::errors::*; use crate::errors::*;
use crate::renderer::html_handlebars::helpers; use crate::renderer::html_handlebars::helpers;
@ -354,12 +352,12 @@ index d304259..c89eaea 100644
Ok(()) Ok(())
} }
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 diff --git a/vendor/mdbook-0.4.42/src/renderer/html_handlebars/search.rs b/vendor/mdbook-0.4.42/src/renderer/html_handlebars/search.rs
index 1144c9f..97f9b0d 100644 index c03eb4f..e25ec4a 100644
--- a/vendor/mdbook-0.4.40/src/renderer/html_handlebars/search.rs --- a/vendor/mdbook-0.4.42/src/renderer/html_handlebars/search.rs
+++ b/vendor/mdbook-0.4.40/src/renderer/html_handlebars/search.rs +++ b/vendor/mdbook-0.4.42/src/renderer/html_handlebars/search.rs
@@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) -> @@ -53,8 +53,6 @@ pub fn create_files(search_config: &Search, destination: &Path, book: &Book) ->
format!("Object.assign(window.search, {});", index).as_bytes(), format!("Object.assign(window.search, {index});").as_bytes(),
)?; )?;
utils::fs::write_file(destination, "searcher.js", searcher::JS)?; utils::fs::write_file(destination, "searcher.js", searcher::JS)?;
- utils::fs::write_file(destination, "mark.min.js", searcher::MARK_JS)?; - utils::fs::write_file(destination, "mark.min.js", searcher::MARK_JS)?;
@ -367,10 +365,10 @@ index 1144c9f..97f9b0d 100644
debug!("Copying search files ✓"); debug!("Copying search files ✓");
} }
diff --git a/vendor/mdbook-0.4.40/src/theme/index.hbs b/vendor/mdbook-0.4.40/src/theme/index.hbs diff --git a/vendor/mdbook-0.4.42/src/theme/index.hbs b/vendor/mdbook-0.4.42/src/theme/index.hbs
index 080b785..f6064f6 100644 index 7775f26..8fc5353 100644
--- a/vendor/mdbook-0.4.40/src/theme/index.hbs --- a/vendor/mdbook-0.4.42/src/theme/index.hbs
+++ b/vendor/mdbook-0.4.40/src/theme/index.hbs +++ b/vendor/mdbook-0.4.42/src/theme/index.hbs
@@ -33,10 +33,7 @@ @@ -33,10 +33,7 @@
{{/if}} {{/if}}
@ -390,45 +388,9 @@ index 080b785..f6064f6 100644
- <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> - <script async src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
+ <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script> + <script async src="MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>
{{/if}} {{/if}}
</head>
<body class="sidebar-visible no-js">
@@ -61,35 +58,6 @@
var default_theme = window.matchMedia("(prefers-color-scheme: dark)").matches ? "{{ preferred_dark_theme }}" : "{{ default_theme }}";
</script>
- <!-- Work around some values being stored in localStorage wrapped in quotes --> <!-- Provide site root to javascript -->
- <script> @@ -248,54 +245,8 @@
- try {
- var theme = localStorage.getItem('mdbook-theme');
- var sidebar = localStorage.getItem('mdbook-sidebar');
-
- if (theme.startsWith('"') && theme.endsWith('"')) {
- localStorage.setItem('mdbook-theme', theme.slice(1, theme.length - 1));
- }
-
- if (sidebar.startsWith('"') && sidebar.endsWith('"')) {
- localStorage.setItem('mdbook-sidebar', sidebar.slice(1, sidebar.length - 1));
- }
- } catch (e) { }
- </script>
-
- <!-- Set the theme before any content is loaded, prevents flash -->
- <script>
- var theme;
- try { theme = localStorage.getItem('mdbook-theme'); } catch(e) { }
- if (theme === null || theme === undefined) { theme = default_theme; }
- var html = document.querySelector('html');
- html.classList.remove('{{ default_theme }}')
- html.classList.add(theme);
- var body = document.querySelector('body');
- body.classList.remove('no-js')
- body.classList.add('js');
- </script>
-
<input type="checkbox" id="sidebar-toggle-anchor" class="hidden">
<!-- Hide / unhide sidebar before it is displayed -->
@@ -269,54 +237,8 @@
</script> </script>
{{/if}} {{/if}}
@ -485,10 +447,10 @@ index 080b785..f6064f6 100644
<!-- Custom JS scripts --> <!-- Custom JS scripts -->
{{#each additional_js}} {{#each additional_js}}
diff --git a/vendor/mdbook-0.4.40/src/theme/mod.rs b/vendor/mdbook-0.4.40/src/theme/mod.rs diff --git a/vendor/mdbook-0.4.42/src/theme/mod.rs b/vendor/mdbook-0.4.42/src/theme/mod.rs
index 1c108d6..388e4d6 100644 index b173bd4..46a6902 100644
--- a/vendor/mdbook-0.4.40/src/theme/mod.rs --- a/vendor/mdbook-0.4.42/src/theme/mod.rs
+++ b/vendor/mdbook-0.4.40/src/theme/mod.rs +++ b/vendor/mdbook-0.4.42/src/theme/mod.rs
@@ -1,9 +1,5 @@ @@ -1,9 +1,5 @@
#![allow(missing_docs)] #![allow(missing_docs)]
@ -499,7 +461,7 @@ index 1c108d6..388e4d6 100644
#[cfg(feature = "search")] #[cfg(feature = "search")]
pub mod searcher; pub mod searcher;
@@ -24,19 +20,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css"); @@ -26,19 +22,8 @@ pub static VARIABLES_CSS: &[u8] = include_bytes!("css/variables.css");
pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png"); pub static FAVICON_PNG: &[u8] = include_bytes!("favicon.png");
pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg"); pub static FAVICON_SVG: &[u8] = include_bytes!("favicon.svg");
pub static JS: &[u8] = include_bytes!("book.js"); pub static JS: &[u8] = include_bytes!("book.js");
@ -519,7 +481,7 @@ index 1c108d6..388e4d6 100644
/// The `Theme` struct should be used instead of the static variables because /// The `Theme` struct should be used instead of the static variables because
/// the `new()` method will look if the user has a theme directory in their /// the `new()` method will look if the user has a theme directory in their
@@ -59,11 +44,8 @@ pub struct Theme { @@ -63,11 +48,8 @@ pub struct Theme {
pub favicon_png: Option<Vec<u8>>, pub favicon_png: Option<Vec<u8>>,
pub favicon_svg: Option<Vec<u8>>, pub favicon_svg: Option<Vec<u8>>,
pub js: Vec<u8>, pub js: Vec<u8>,
@ -531,7 +493,7 @@ index 1c108d6..388e4d6 100644
} }
impl Theme { impl Theme {
@@ -93,9 +75,6 @@ impl Theme { @@ -99,9 +81,6 @@ impl Theme {
theme_dir.join("css/variables.css"), theme_dir.join("css/variables.css"),
&mut theme.variables_css, &mut theme.variables_css,
), ),
@ -541,7 +503,7 @@ index 1c108d6..388e4d6 100644
( (
theme_dir.join("tomorrow-night.css"), theme_dir.join("tomorrow-night.css"),
&mut theme.tomorrow_night_css, &mut theme.tomorrow_night_css,
@@ -183,11 +162,8 @@ impl Default for Theme { @@ -191,11 +170,8 @@ impl Default for Theme {
favicon_png: Some(FAVICON_PNG.to_owned()), favicon_png: Some(FAVICON_PNG.to_owned()),
favicon_svg: Some(FAVICON_SVG.to_owned()), favicon_svg: Some(FAVICON_SVG.to_owned()),
js: JS.to_owned(), js: JS.to_owned(),
@ -553,7 +515,7 @@ index 1c108d6..388e4d6 100644
} }
} }
} }
@@ -272,11 +248,8 @@ mod tests { @@ -284,11 +260,8 @@ mod tests {
favicon_png: Some(Vec::new()), favicon_png: Some(Vec::new()),
favicon_svg: Some(Vec::new()), favicon_svg: Some(Vec::new()),
js: Vec::new(), js: Vec::new(),
@ -565,13 +527,28 @@ index 1c108d6..388e4d6 100644
}; };
assert_eq!(got, empty); assert_eq!(got, empty);
diff --git a/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs b/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs diff --git a/vendor/mdbook-0.4.42/src/theme/searcher/mod.rs b/vendor/mdbook-0.4.42/src/theme/searcher/mod.rs
index d5029db..59eda8a 100644 index d5029db..59eda8a 100644
--- a/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs --- a/vendor/mdbook-0.4.42/src/theme/searcher/mod.rs
+++ b/vendor/mdbook-0.4.40/src/theme/searcher/mod.rs +++ b/vendor/mdbook-0.4.42/src/theme/searcher/mod.rs
@@ -2,5 +2,3 @@ @@ -2,5 +2,3 @@
//! the "search" cargo feature is disabled. //! the "search" cargo feature is disabled.
pub static JS: &[u8] = include_bytes!("searcher.js"); pub static JS: &[u8] = include_bytes!("searcher.js");
-pub static MARK_JS: &[u8] = include_bytes!("mark.min.js"); -pub static MARK_JS: &[u8] = include_bytes!("mark.min.js");
-pub static ELASTICLUNR_JS: &[u8] = include_bytes!("elasticlunr.min.js"); -pub static ELASTICLUNR_JS: &[u8] = include_bytes!("elasticlunr.min.js");
diff --git a/vendor/mdbook-0.4.42/src/theme/toc.html.hbs b/vendor/mdbook-0.4.42/src/theme/toc.html.hbs
index f8fca87..4993db8 100644
--- a/vendor/mdbook-0.4.42/src/theme/toc.html.hbs
+++ b/vendor/mdbook-0.4.42/src/theme/toc.html.hbs
@@ -28,9 +28,8 @@
<link rel="stylesheet" href="{{ path_to_root }}css/print.css" media="print">
{{/if}}
<!-- Fonts -->
- <link rel="stylesheet" href="{{ path_to_root }}FontAwesome/css/font-awesome.css">
+ <link rel="stylesheet" href="{{ path_to_root }}css/font-awesome.min.css">
{{#if copy_fonts}}
- <link rel="stylesheet" href="{{ path_to_root }}fonts/fonts.css">
{{/if}}
<!-- Custom theme stylesheets -->
{{#each additional_css}}

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

@ -8,10 +8,11 @@ Forwarded: not-needed
--- ---
compiler/rustc/Cargo.toml | 6 ------ compiler/rustc/Cargo.toml | 6 ------
src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 -- src/tools/rust-analyzer/crates/profile/Cargo.toml | 2 --
2 files changed, 8 deletions(-) src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml | 4 ----
3 files changed, 12 deletions(-)
diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml diff --git a/compiler/rustc/Cargo.toml b/compiler/rustc/Cargo.toml
index a2fc9d5..7a9aafc 100644 index f85c30a..2256524 100644
--- a/compiler/rustc/Cargo.toml --- a/compiler/rustc/Cargo.toml
+++ b/compiler/rustc/Cargo.toml +++ b/compiler/rustc/Cargo.toml
@@ -20,14 +20,8 @@ rustc_smir = { path = "../rustc_smir" } @@ -20,14 +20,8 @@ rustc_smir = { path = "../rustc_smir" }
@ -49,3 +50,25 @@ index 2e3413f..f823aa1 100644
# Uncomment to enable for the whole crate graph # Uncomment to enable for the whole crate graph
# default = [ "cpu_profiler" ] # default = [ "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 2dd2f22..50a4bab 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -74,9 +74,6 @@ paths.workspace = true
[target.'cfg(windows)'.dependencies]
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
@@ -86,7 +83,6 @@ test-fixture.workspace = true
syntax-bridge.workspace = true
[features]
-jemalloc = ["jemallocator", "profile/jemalloc"]
force-always-assert = ["always-assert/force"]
sysroot-abi = []
in-rust-tree = [

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

@ -12,19 +12,19 @@ Forwarded: not-needed
1 file changed, 2 insertions(+), 4 deletions(-) 1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
index c797f11..32dc2c5 100644 index c2cbff8..b1386fc 100644
--- a/src/tools/cargo/Cargo.toml --- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml
@@ -79,7 +79,7 @@ proptest = "1.5.0" @@ -80,7 +80,7 @@ proptest = "1.5.0"
pulldown-cmark = { version = "0.11.0", default-features = false, features = ["html"] } pulldown-cmark = { version = "0.12.0", default-features = false, features = ["html"] }
rand = "0.8.5" rand = "0.8.5"
regex = "1.10.5" regex = "1.10.5"
-rusqlite = { version = "0.32.0", features = ["bundled"] } -rusqlite = { version = "0.32.0", features = ["bundled"] }
+rusqlite = { version = "0.32.0", features = [] } +rusqlite = { version = "0.32.0" }
rustfix = { version = "0.8.2", path = "crates/rustfix" } rustc-hash = "2.0.0"
rustfix = { version = "0.9.0", path = "crates/rustfix" }
same-file = "1.0.6" same-file = "1.0.6"
security-framework = "2.11.1" @@ -264,10 +264,8 @@ test = false
@@ -258,10 +258,8 @@ test = false
doc = false doc = false
[features] [features]

10
debian/patches/prune/d-0011-cargo-remove-nghttp2.patch vendored
View File

@ -8,13 +8,13 @@ Last-Update: 2023-05-17
Forwarded: not-needed Forwarded: not-needed
--- ---
vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml | 2 +- vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml b/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml diff --git a/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml b/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml
index 8a30cdc..43b9be2 100644 index 1133f00..1d2ec68 100644
--- a/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml --- a/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml
+++ b/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml +++ b/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml
@@ -61,7 +61,7 @@ version = "0.3.3" @@ -61,7 +61,7 @@ version = "0.3.3"
[features] [features]
default = ["ssl"] default = ["ssl"]

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

@ -44,10 +44,10 @@ Forwarded: not-needed
26 files changed, 5 insertions(+), 167 deletions(-) 26 files changed, 5 insertions(+), 167 deletions(-)
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index dffb7a7..e425a4c 100644 index eb9a8eb..e12df97 100644
--- a/compiler/rustc_codegen_ssa/Cargo.toml --- a/compiler/rustc_codegen_ssa/Cargo.toml
+++ b/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -55,7 +55,3 @@ libc = "0.2.50" @@ -56,7 +56,3 @@ libc = "0.2.50"
version = "0.36.2" version = "0.36.2"
default-features = false default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"] features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
@ -56,7 +56,7 @@ index dffb7a7..e425a4c 100644
-version = "0.57.0" -version = "0.57.0"
-features = ["Win32_Globalization"] -features = ["Win32_Globalization"]
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
index d73cf11..8cf85d2 100644 index c8ecddb..36486ca 100644
--- a/compiler/rustc_data_structures/Cargo.toml --- a/compiler/rustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml +++ b/compiler/rustc_data_structures/Cargo.toml
@@ -31,16 +31,6 @@ tracing = "0.1" @@ -31,16 +31,6 @@ tracing = "0.1"
@ -77,7 +77,7 @@ index d73cf11..8cf85d2 100644
# tidy-alphabetical-start # tidy-alphabetical-start
libc = "0.2" libc = "0.2"
diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
index ef577c0..447b9f2 100644 index 81f15eb..03cf9be 100644
--- a/compiler/rustc_driver_impl/Cargo.toml --- a/compiler/rustc_driver_impl/Cargo.toml
+++ b/compiler/rustc_driver_impl/Cargo.toml +++ b/compiler/rustc_driver_impl/Cargo.toml
@@ -58,12 +58,6 @@ tracing = { version = "0.1.35" } @@ -58,12 +58,6 @@ tracing = { version = "0.1.35" }
@ -94,13 +94,14 @@ index ef577c0..447b9f2 100644
# tidy-alphabetical-start # tidy-alphabetical-start
ctrlc = "3.4.4" ctrlc = "3.4.4"
diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml
index 00eaf4d..159c390 100644 index 06bae57..6c10eba 100644
--- a/compiler/rustc_errors/Cargo.toml --- a/compiler/rustc_errors/Cargo.toml
+++ b/compiler/rustc_errors/Cargo.toml +++ b/compiler/rustc_errors/Cargo.toml
@@ -28,14 +28,6 @@ termize = "0.1.1" @@ -28,11 +28,3 @@ termcolor = "1.2.0"
termize = "0.1.1"
tracing = "0.1" tracing = "0.1"
# tidy-alphabetical-end # tidy-alphabetical-end
-
-[target.'cfg(windows)'.dependencies.windows] -[target.'cfg(windows)'.dependencies.windows]
-version = "0.57.0" -version = "0.57.0"
-features = [ -features = [
@ -108,15 +109,11 @@ index 00eaf4d..159c390 100644
- "Win32_Security", - "Win32_Security",
- "Win32_System_Threading", - "Win32_System_Threading",
-] -]
-
[features]
# tidy-alphabetical-start
rustc_use_parallel_compiler = ['rustc_error_messages/rustc_use_parallel_compiler']
diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml
index 75cc8f1..099c79d 100644 index e998369..14ca737 100644
--- a/compiler/rustc_session/Cargo.toml --- a/compiler/rustc_session/Cargo.toml
+++ b/compiler/rustc_session/Cargo.toml +++ b/compiler/rustc_session/Cargo.toml
@@ -28,10 +28,3 @@ tracing = "0.1" @@ -29,10 +29,3 @@ tracing = "0.1"
# tidy-alphabetical-start # tidy-alphabetical-start
libc = "0.2" libc = "0.2"
# tidy-alphabetical-end # tidy-alphabetical-end
@ -156,7 +153,7 @@ index a9c29ce..11bfd53 100644
default = ['backtrace'] default = ['backtrace']
backtrace = ['addr2line', 'miniz_oxide', 'object'] backtrace = ['addr2line', 'miniz_oxide', 'object']
diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml
index ba50508..1618dde 100644 index 7950f10..31377b2 100644
--- a/src/bootstrap/Cargo.toml --- a/src/bootstrap/Cargo.toml
+++ b/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml
@@ -65,21 +65,6 @@ xz2 = "0.1" @@ -65,21 +65,6 @@ xz2 = "0.1"
@ -182,7 +179,7 @@ index ba50508..1618dde 100644
pretty_assertions = "1.4" pretty_assertions = "1.4"
diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml diff --git a/src/tools/cargo/Cargo.toml b/src/tools/cargo/Cargo.toml
index 32dc2c5..445029d 100644 index b1386fc..93381f5 100644
--- a/src/tools/cargo/Cargo.toml --- a/src/tools/cargo/Cargo.toml
+++ b/src/tools/cargo/Cargo.toml +++ b/src/tools/cargo/Cargo.toml
@@ -2,7 +2,9 @@ @@ -2,7 +2,9 @@
@ -196,7 +193,7 @@ index 32dc2c5..445029d 100644
"benches/benchsuite", "benches/benchsuite",
"benches/capture", "benches/capture",
] ]
@@ -28,8 +30,6 @@ bytesize = "1.3" @@ -29,8 +31,6 @@ bytesize = "1.3"
cargo = { path = "" } cargo = { path = "" }
cargo-credential = { version = "0.4.2", path = "credential/cargo-credential" } cargo-credential = { version = "0.4.2", path = "credential/cargo-credential" }
cargo-credential-libsecret = { version = "0.4.7", path = "credential/cargo-credential-libsecret" } cargo-credential-libsecret = { version = "0.4.7", path = "credential/cargo-credential-libsecret" }
@ -204,8 +201,8 @@ index 32dc2c5..445029d 100644
-cargo-credential-wincred = { version = "0.4.7", path = "credential/cargo-credential-wincred" } -cargo-credential-wincred = { version = "0.4.7", path = "credential/cargo-credential-wincred" }
cargo-platform = { path = "crates/cargo-platform", version = "0.1.5" } cargo-platform = { path = "crates/cargo-platform", version = "0.1.5" }
cargo-test-macro = { version = "0.3.0", path = "crates/cargo-test-macro" } cargo-test-macro = { version = "0.3.0", path = "crates/cargo-test-macro" }
cargo-test-support = { version = "0.5.0", path = "crates/cargo-test-support" } cargo-test-support = { version = "0.6.0", path = "crates/cargo-test-support" }
@@ -110,7 +110,6 @@ unicode-xid = "0.2.4" @@ -114,7 +114,6 @@ unicode-xid = "0.2.4"
url = "2.5.2" url = "2.5.2"
varisat = "0.2.2" varisat = "0.2.2"
walkdir = "2.5.0" walkdir = "2.5.0"
@ -213,7 +210,7 @@ index 32dc2c5..445029d 100644
[workspace.lints.rust] [workspace.lints.rust]
rust_2018_idioms = "warn" # TODO: could this be removed? rust_2018_idioms = "warn" # TODO: could this be removed?
@@ -152,6 +151,7 @@ base64.workspace = true @@ -157,6 +156,7 @@ base64.workspace = true
blake3.workspace = true blake3.workspace = true
bytesize.workspace = true bytesize.workspace = true
cargo-credential.workspace = true cargo-credential.workspace = true
@ -221,7 +218,7 @@ index 32dc2c5..445029d 100644
cargo-platform.workspace = true cargo-platform.workspace = true
cargo-util-schemas.workspace = true cargo-util-schemas.workspace = true
cargo-util.workspace = true cargo-util.workspace = true
@@ -220,27 +220,9 @@ libc.workspace = true @@ -226,27 +226,9 @@ libc.workspace = true
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(target_os = "linux")'.dependencies]
cargo-credential-libsecret.workspace = true cargo-credential-libsecret.workspace = true
@ -250,7 +247,7 @@ index 32dc2c5..445029d 100644
annotate-snippets = { workspace = true, features = ["testing-colors"] } annotate-snippets = { workspace = true, features = ["testing-colors"] }
cargo-test-support.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 diff --git a/src/tools/cargo/crates/cargo-test-support/Cargo.toml b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
index c8420eb..06dd705 100644 index e083b3c..d4b74df 100644
--- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml --- a/src/tools/cargo/crates/cargo-test-support/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml +++ b/src/tools/cargo/crates/cargo-test-support/Cargo.toml
@@ -31,8 +31,5 @@ toml.workspace = true @@ -31,8 +31,5 @@ toml.workspace = true
@ -263,7 +260,7 @@ index c8420eb..06dd705 100644
[lints] [lints]
workspace = true workspace = true
diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml diff --git a/src/tools/cargo/crates/cargo-util/Cargo.toml b/src/tools/cargo/crates/cargo-util/Cargo.toml
index 554689c..bca1f67 100644 index 63f72d7..f2fdccb 100644
--- a/src/tools/cargo/crates/cargo-util/Cargo.toml --- a/src/tools/cargo/crates/cargo-util/Cargo.toml
+++ b/src/tools/cargo/crates/cargo-util/Cargo.toml +++ b/src/tools/cargo/crates/cargo-util/Cargo.toml
@@ -21,15 +21,8 @@ tempfile.workspace = true @@ -21,15 +21,8 @@ tempfile.workspace = true
@ -296,7 +293,7 @@ index 91742e5..0054cad 100644
[lints] [lints]
workspace = true workspace = true
diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml diff --git a/src/tools/cargo/credential/cargo-credential/Cargo.toml b/src/tools/cargo/credential/cargo-credential/Cargo.toml
index b3da12d..f4df0c5 100644 index 713fa41..5017448 100644
--- a/src/tools/cargo/credential/cargo-credential/Cargo.toml --- a/src/tools/cargo/credential/cargo-credential/Cargo.toml
+++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml +++ b/src/tools/cargo/credential/cargo-credential/Cargo.toml
@@ -18,9 +18,6 @@ time.workspace = true @@ -18,9 +18,6 @@ time.workspace = true
@ -310,7 +307,7 @@ index b3da12d..f4df0c5 100644
snapbox = { workspace = true, features = ["examples"] } snapbox = { workspace = true, features = ["examples"] }
diff --git a/src/tools/cargo/src/cargo/util/auth/mod.rs b/src/tools/cargo/src/cargo/util/auth/mod.rs diff --git a/src/tools/cargo/src/cargo/util/auth/mod.rs b/src/tools/cargo/src/cargo/util/auth/mod.rs
index cf4cccb..c69dd93 100644 index 2576b4b..9ab86e7 100644
--- a/src/tools/cargo/src/cargo/util/auth/mod.rs --- a/src/tools/cargo/src/cargo/util/auth/mod.rs
+++ b/src/tools/cargo/src/cargo/util/auth/mod.rs +++ b/src/tools/cargo/src/cargo/util/auth/mod.rs
@@ -529,11 +529,6 @@ fn credential_action( @@ -529,11 +529,6 @@ fn credential_action(
@ -326,10 +323,10 @@ index cf4cccb..c69dd93 100644
name if BUILT_IN_PROVIDERS.contains(&name) => { name if BUILT_IN_PROVIDERS.contains(&name) => {
Box::new(cargo_credential::UnsupportedCredential {}) Box::new(cargo_credential::UnsupportedCredential {})
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
index b6a89dd..50acf5b 100644 index b784bdb..01ead35 100644
--- a/src/tools/compiletest/Cargo.toml --- a/src/tools/compiletest/Cargo.toml
+++ b/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml
@@ -28,13 +28,3 @@ home = "0.5.5" @@ -29,13 +29,3 @@ home = "0.5.5"
[target.'cfg(unix)'.dependencies] [target.'cfg(unix)'.dependencies]
libc = "0.2" libc = "0.2"
@ -358,7 +355,7 @@ index f823aa1..c82566f 100644
cpu_profiler = [] cpu_profiler = []
diff --git a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml b/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 eb95f42..e85e86a 100644 index 50a4bab..6397b99 100644
--- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml --- a/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
+++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml +++ b/src/tools/rust-analyzer/crates/rust-analyzer/Cargo.toml
@@ -71,9 +71,6 @@ vfs-notify.workspace = true @@ -71,9 +71,6 @@ vfs-notify.workspace = true
@ -368,9 +365,9 @@ index eb95f42..e85e86a 100644
-[target.'cfg(windows)'.dependencies] -[target.'cfg(windows)'.dependencies]
-windows-sys = { version = "0.52", features = ["Win32_System_Threading"] } -windows-sys = { version = "0.52", features = ["Win32_System_Threading"] }
- -
[target.'cfg(not(target_env = "msvc"))'.dependencies] [dev-dependencies]
jemallocator = { version = "0.5.0", package = "tikv-jemallocator", optional = true } expect-test = "1.4.0"
xshell.workspace = true
diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml diff --git a/src/tools/rust-analyzer/crates/stdx/Cargo.toml b/src/tools/rust-analyzer/crates/stdx/Cargo.toml
index bf0d6df..bfd04c9 100644 index bf0d6df..bfd04c9 100644
--- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml --- a/src/tools/rust-analyzer/crates/stdx/Cargo.toml

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

@ -21,57 +21,60 @@ Forwarded: not-needed
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
--- ---
vendor/android-tzdata-0.1.1/Cargo.toml | 1 + vendor/android-tzdata-0.1.1/Cargo.toml | 1 +
vendor/anstream-0.6.15/Cargo.toml | 6 ---- vendor/anstream-0.6.18/Cargo.toml | 6 ----
vendor/anstyle-query-1.1.1/Cargo.toml | 7 ---- vendor/anstyle-query-1.1.2/Cargo.toml | 7 ----
vendor/backtrace-0.3.71/Cargo.toml | 14 -------- vendor/backtrace-0.3.71/Cargo.toml | 14 --------
vendor/backtrace-0.3.73/Cargo.toml | 16 --------- vendor/backtrace-0.3.73/Cargo.toml | 16 ---------
vendor/chrono-0.4.38/Cargo.toml | 9 +---- vendor/chrono-0.4.38/Cargo.toml | 9 +----
vendor/colored-2.1.0/Cargo.toml | 7 ---- vendor/colored-2.1.0/Cargo.toml | 7 ----
vendor/console-0.15.8/Cargo.toml | 12 ------- vendor/console-0.15.8/Cargo.toml | 12 -------
vendor/ctrlc-3.4.5/Cargo.toml | 18 ---------- vendor/ctrlc-3.4.5/Cargo.toml | 18 ----------
vendor/curl-0.4.46/Cargo.toml | 11 ------- vendor/curl-0.4.47/Cargo.toml | 11 -------
vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml | 4 --- vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml | 4 ---
vendor/dbus-0.9.7/Cargo.toml | 4 --- vendor/dbus-0.9.7/Cargo.toml | 4 ---
vendor/dirs-sys-0.4.1/Cargo.toml | 9 ----- vendor/dirs-sys-0.4.1/Cargo.toml | 9 -----
vendor/dirs-sys-next-0.1.2/Cargo.toml | 3 -- vendor/dirs-sys-next-0.1.2/Cargo.toml | 3 --
vendor/dlmalloc-0.2.6/Cargo.toml | 9 ----- vendor/dlmalloc-0.2.7/Cargo.toml | 9 -----
vendor/env_logger-0.11.5/Cargo.toml | 2 +- vendor/env_logger-0.11.5/Cargo.toml | 2 +-
vendor/errno-0.3.9/Cargo.toml | 7 ---- vendor/errno-0.3.9/Cargo.toml | 7 ----
vendor/fd-lock-4.0.2/Cargo.toml | 8 ----- vendor/fd-lock-4.0.2/Cargo.toml | 8 -----
vendor/filetime-0.2.25/Cargo.toml | 7 ---- vendor/filetime-0.2.25/Cargo.toml | 7 ----
vendor/gix-path-0.10.11/Cargo.toml | 10 ------ vendor/gix-path-0.10.12/Cargo.toml | 10 ------
vendor/gix-sec-0.10.7/Cargo.toml | 13 -------- vendor/gix-sec-0.10.9/Cargo.toml | 10 ------
vendor/home-0.5.9/Cargo.toml | 8 ----- vendor/home-0.5.9/Cargo.toml | 8 -----
vendor/iana-time-zone-0.1.61/Cargo.toml | 3 -- vendor/iana-time-zone-0.1.61/Cargo.toml | 3 --
vendor/ignore-0.4.23/Cargo.toml | 3 -- vendor/ignore-0.4.23/Cargo.toml | 3 --
vendor/is-terminal-0.4.12/Cargo.toml | 11 ------- vendor/is-terminal-0.4.12/Cargo.toml | 11 -------
vendor/is_executable-1.0.3/Cargo.toml | 4 --- vendor/is_executable-1.0.3/Cargo.toml | 4 ---
vendor/jiff-0.1.13/Cargo.toml | 10 ------
vendor/libloading-0.8.5/Cargo.toml | 7 ---- vendor/libloading-0.8.5/Cargo.toml | 7 ----
vendor/libssh2-sys-0.3.0/Cargo.toml | 8 ----- vendor/libssh2-sys-0.3.0/Cargo.toml | 8 -----
vendor/mio-0.8.11/Cargo.toml | 12 -------
vendor/notify-6.1.1/Cargo.toml | 11 -------
vendor/nu-ansi-term-0.46.0/Cargo.toml | 10 ------ vendor/nu-ansi-term-0.46.0/Cargo.toml | 10 ------
vendor/nu-ansi-term-0.50.1/Cargo.toml | 10 ------ vendor/nu-ansi-term-0.50.1/Cargo.toml | 10 ------
vendor/onig-6.4.0/Cargo.toml | 3 -- vendor/onig-6.4.0/Cargo.toml | 3 --
vendor/opener-0.5.2/Cargo.toml | 4 --- vendor/opener-0.5.2/Cargo.toml | 4 ---
vendor/opener-0.6.1/Cargo.toml | 9 -----
vendor/opener-0.7.2/Cargo.toml | 12 ------- vendor/opener-0.7.2/Cargo.toml | 12 -------
vendor/os_info-3.8.2/Cargo.toml | 12 ------- vendor/os_info-3.8.2/Cargo.toml | 12 -------
vendor/parking_lot_core-0.9.10/Cargo.toml | 3 -- vendor/parking_lot_core-0.9.10/Cargo.toml | 3 --
vendor/rustix-0.38.37/Cargo.toml | 14 -------- vendor/process-wrap-8.0.2/Cargo.toml | 11 -------
vendor/rustix-0.38.38/Cargo.toml | 9 -----
vendor/same-file-1.0.6/Cargo.toml | 2 -- vendor/same-file-1.0.6/Cargo.toml | 2 --
vendor/snapbox-0.6.18/Cargo.toml | 6 ---- vendor/snapbox-0.6.20/Cargo.toml | 6 ----
vendor/socket2-0.5.7/Cargo.toml | 10 ------ vendor/socket2-0.5.7/Cargo.toml | 10 ------
vendor/stacker-0.1.17/Cargo.toml | 8 ----- vendor/stacker-0.1.17/Cargo.toml | 8 -----
vendor/sysinfo-0.31.4/Cargo.toml | 47 --------------------------- vendor/sysinfo-0.31.4/Cargo.toml | 47 ---------------------------
vendor/tempfile-3.13.0/Cargo.toml | 7 ---- vendor/tempfile-3.13.0/Cargo.toml | 7 ----
vendor/term-0.7.0/Cargo.toml | 6 ---- vendor/term-0.7.0/Cargo.toml | 6 ----
vendor/termcolor-1.4.1/Cargo.toml | 3 -- vendor/termcolor-1.4.1/Cargo.toml | 3 --
vendor/terminal_size-0.3.0/Cargo.toml | 7 ---- vendor/terminal_size-0.4.0/Cargo.toml | 7 ----
vendor/termize-0.1.1/Cargo.toml | 3 -- vendor/termize-0.1.1/Cargo.toml | 3 --
vendor/tokio-1.40.0/Cargo.toml | 21 ------------ vendor/tokio-1.41.0/Cargo.toml | 21 ------------
vendor/uuid-1.10.0/Cargo.toml | 1 - vendor/uuid-1.11.0/Cargo.toml | 1 -
vendor/walkdir-2.5.0/Cargo.toml | 3 -- vendor/walkdir-2.5.0/Cargo.toml | 3 --
vendor/yansi-term-0.1.2/Cargo.toml | 3 -- vendor/yansi-term-0.1.2/Cargo.toml | 3 --
51 files changed, 3 insertions(+), 422 deletions(-) 54 files changed, 3 insertions(+), 449 deletions(-)
diff --git a/vendor/android-tzdata-0.1.1/Cargo.toml b/vendor/android-tzdata-0.1.1/Cargo.toml diff --git a/vendor/android-tzdata-0.1.1/Cargo.toml b/vendor/android-tzdata-0.1.1/Cargo.toml
index 805128a..0682717 100644 index 805128a..0682717 100644
@ -82,10 +85,10 @@ index 805128a..0682717 100644
[dev-dependencies.zip] [dev-dependencies.zip]
version = "0.6.4" version = "0.6.4"
+repository = "https://github.com/rust-cli/concolor" +repository = "https://github.com/rust-cli/concolor"
diff --git a/vendor/anstream-0.6.15/Cargo.toml b/vendor/anstream-0.6.15/Cargo.toml diff --git a/vendor/anstream-0.6.18/Cargo.toml b/vendor/anstream-0.6.18/Cargo.toml
index 677fa95..deca21b 100644 index a0b88d7..2a501f2 100644
--- a/vendor/anstream-0.6.15/Cargo.toml --- a/vendor/anstream-0.6.18/Cargo.toml
+++ b/vendor/anstream-0.6.15/Cargo.toml +++ b/vendor/anstream-0.6.18/Cargo.toml
@@ -152,14 +152,8 @@ version = "0.2.0" @@ -152,14 +152,8 @@ version = "0.2.0"
auto = ["dep:anstyle-query"] auto = ["dep:anstyle-query"]
default = [ default = [
@ -96,21 +99,21 @@ index 677fa95..deca21b 100644
-wincon = ["dep:anstyle-wincon"] -wincon = ["dep:anstyle-wincon"]
- -
-[target."cfg(windows)".dependencies.anstyle-wincon] -[target."cfg(windows)".dependencies.anstyle-wincon]
-version = "3.0.1" -version = "3.0.5"
-optional = true -optional = true
[lints.clippy] [lints.clippy]
bool_assert_comparison = "allow" bool_assert_comparison = "allow"
diff --git a/vendor/anstyle-query-1.1.1/Cargo.toml b/vendor/anstyle-query-1.1.1/Cargo.toml diff --git a/vendor/anstyle-query-1.1.2/Cargo.toml b/vendor/anstyle-query-1.1.2/Cargo.toml
index 4fed84e..dffd33c 100644 index 8073b87..1431cec 100644
--- a/vendor/anstyle-query-1.1.1/Cargo.toml --- a/vendor/anstyle-query-1.1.2/Cargo.toml
+++ b/vendor/anstyle-query-1.1.1/Cargo.toml +++ b/vendor/anstyle-query-1.1.2/Cargo.toml
@@ -92,13 +92,6 @@ path = "src/lib.rs" @@ -92,13 +92,6 @@ path = "src/lib.rs"
name = "query" name = "query"
path = "examples/query.rs" path = "examples/query.rs"
-[target."cfg(windows)".dependencies.windows-sys] -[target."cfg(windows)".dependencies.windows-sys]
-version = "0.52.0" -version = "0.59.0"
-features = [ -features = [
- "Win32_System_Console", - "Win32_System_Console",
- "Win32_Foundation", - "Win32_Foundation",
@ -275,32 +278,29 @@ index c32a86c..3c1f918 100644
- -
[badges.maintenance] [badges.maintenance]
status = "passively-maintained" status = "passively-maintained"
diff --git a/vendor/curl-0.4.46/Cargo.toml b/vendor/curl-0.4.46/Cargo.toml diff --git a/vendor/curl-0.4.47/Cargo.toml b/vendor/curl-0.4.47/Cargo.toml
index fc961dd..d102279 100644 index 580f431..7ac8e91 100644
--- a/vendor/curl-0.4.46/Cargo.toml --- a/vendor/curl-0.4.47/Cargo.toml
+++ b/vendor/curl-0.4.46/Cargo.toml +++ b/vendor/curl-0.4.47/Cargo.toml
@@ -116,17 +116,6 @@ optional = true @@ -144,14 +144,3 @@ optional = true
[target.'cfg(all(unix, not(target_os = "macos")))'.dependencies.openssl-sys]
version = "0.9.64" version = "0.9.64"
optional = true optional = true
-
-[target."cfg(target_env = \"msvc\")".dependencies.schannel] -[target.'cfg(target_env = "msvc")'.dependencies.schannel]
-version = "0.1.13" -version = "0.1.13"
- -
-[target."cfg(target_env = \"msvc\")".dependencies.windows-sys] -[target.'cfg(target_env = "msvc")'.dependencies.windows-sys]
-version = "0.52" -version = "0.52"
-features = [ -features = [
- "Win32_Foundation", - "Win32_Foundation",
- "Win32_System_LibraryLoader", - "Win32_System_LibraryLoader",
- "Win32_Security_Cryptography", - "Win32_Security_Cryptography",
-] -]
- diff --git a/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml b/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml
[badges.appveyor] index 1d2ec68..3766fb0 100644
repository = "alexcrichton/curl-rust" --- a/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml
+++ b/vendor/curl-sys-0.4.77+curl-8.10.1/Cargo.toml
diff --git a/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml b/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml
index 43b9be2..25603b1 100644
--- a/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml
+++ b/vendor/curl-sys-0.4.76+curl-8.10.1/Cargo.toml
@@ -84,7 +84,3 @@ optional = true @@ -84,7 +84,3 @@ optional = true
[target.'cfg(target_env = "msvc")'.build-dependencies.vcpkg] [target.'cfg(target_env = "msvc")'.build-dependencies.vcpkg]
@ -353,17 +353,17 @@ index e9d8d0c..acb2eb7 100644
-features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"] -features = ["knownfolders", "objbase", "shlobj", "winbase", "winerror"]
[badges.maintenance] [badges.maintenance]
status = "as-is" status = "as-is"
diff --git a/vendor/dlmalloc-0.2.6/Cargo.toml b/vendor/dlmalloc-0.2.6/Cargo.toml diff --git a/vendor/dlmalloc-0.2.7/Cargo.toml b/vendor/dlmalloc-0.2.7/Cargo.toml
index dbc517b..dfc6b0e 100644 index 8b4957e..a1aa2a1 100644
--- a/vendor/dlmalloc-0.2.6/Cargo.toml --- a/vendor/dlmalloc-0.2.7/Cargo.toml
+++ b/vendor/dlmalloc-0.2.6/Cargo.toml +++ b/vendor/dlmalloc-0.2.7/Cargo.toml
@@ -62,12 +62,3 @@ rustc-dep-of-std = [ @@ -77,12 +77,3 @@ rustc-dep-of-std = [
[target."cfg(all(unix, not(target_arch = \"wasm32\")))".dependencies.libc] [target.'cfg(all(unix, not(target_arch = "wasm32")))'.dependencies.libc]
version = "0.2" version = "0.2"
default-features = false default-features = false
- -
-[target."cfg(target_os = \"windows\")".dependencies.windows-sys] -[target.'cfg(target_os = "windows")'.dependencies.windows-sys]
-version = "0.52.0" -version = ">=0.52.0, <=0.59.*"
-features = [ -features = [
- "Win32_Foundation", - "Win32_Foundation",
- "Win32_System_Memory", - "Win32_System_Memory",
@ -429,11 +429,11 @@ index d621d2c..2ea7805 100644
- "Win32_Foundation", - "Win32_Foundation",
- "Win32_Storage_FileSystem", - "Win32_Storage_FileSystem",
-] -]
diff --git a/vendor/gix-path-0.10.11/Cargo.toml b/vendor/gix-path-0.10.11/Cargo.toml diff --git a/vendor/gix-path-0.10.12/Cargo.toml b/vendor/gix-path-0.10.12/Cargo.toml
index 07e1460..cd4d27d 100644 index 4d93c2e..44725eb 100644
--- a/vendor/gix-path-0.10.11/Cargo.toml --- a/vendor/gix-path-0.10.12/Cargo.toml
+++ b/vendor/gix-path-0.10.11/Cargo.toml +++ b/vendor/gix-path-0.10.12/Cargo.toml
@@ -55,16 +55,6 @@ default-features = false @@ -56,16 +56,6 @@ default-features = false
[target.'cfg(not(target_family = "wasm"))'.dependencies.home] [target.'cfg(not(target_family = "wasm"))'.dependencies.home]
version = "0.5.5" version = "0.5.5"
@ -450,18 +450,14 @@ index 07e1460..cd4d27d 100644
[lints.clippy] [lints.clippy]
bool_to_int_with_if = "allow" bool_to_int_with_if = "allow"
borrow_as_ptr = "allow" borrow_as_ptr = "allow"
diff --git a/vendor/gix-sec-0.10.7/Cargo.toml b/vendor/gix-sec-0.10.7/Cargo.toml diff --git a/vendor/gix-sec-0.10.9/Cargo.toml b/vendor/gix-sec-0.10.9/Cargo.toml
index f85bb5c..09c510f 100644 index 6997e24..2e8aa40 100644
--- a/vendor/gix-sec-0.10.7/Cargo.toml --- a/vendor/gix-sec-0.10.9/Cargo.toml
+++ b/vendor/gix-sec-0.10.7/Cargo.toml +++ b/vendor/gix-sec-0.10.9/Cargo.toml
@@ -65,16 +65,3 @@ serde = [ @@ -70,16 +70,6 @@ version = "0.2.123"
[target."cfg(windows)".dependencies.gix-path]
version = "^0.10.12"
[target."cfg(not(windows))".dependencies.libc]
version = "0.2.123"
-
-[target."cfg(windows)".dependencies.gix-path]
-version = "^0.10.9"
-
-[target."cfg(windows)".dependencies.windows-sys] -[target."cfg(windows)".dependencies.windows-sys]
-version = "0.52.0" -version = "0.52.0"
-features = [ -features = [
@ -471,6 +467,10 @@ index f85bb5c..09c510f 100644
- "Win32_System_Memory", - "Win32_System_Memory",
- "Win32_System_Threading", - "Win32_System_Threading",
-] -]
-
[lints.clippy]
bool_to_int_with_if = "allow"
borrow_as_ptr = "allow"
diff --git a/vendor/home-0.5.9/Cargo.toml b/vendor/home-0.5.9/Cargo.toml diff --git a/vendor/home-0.5.9/Cargo.toml b/vendor/home-0.5.9/Cargo.toml
index 93e3432..3bb226f 100644 index 93e3432..3bb226f 100644
--- a/vendor/home-0.5.9/Cargo.toml --- a/vendor/home-0.5.9/Cargo.toml
@ -545,6 +545,31 @@ index 41f2f56..32747ea 100644
- -
[badges.travis-ci] [badges.travis-ci]
repository = "fitzgen/is_executable" repository = "fitzgen/is_executable"
diff --git a/vendor/jiff-0.1.13/Cargo.toml b/vendor/jiff-0.1.13/Cargo.toml
index 7ff813b..323aa9c 100644
--- a/vendor/jiff-0.1.13/Cargo.toml
+++ b/vendor/jiff-0.1.13/Cargo.toml
@@ -134,7 +134,6 @@ serde = ["dep:serde"]
std = ["alloc"]
tz-system = [
"std",
- "dep:windows-sys",
]
tzdb-bundle-always = [
"dep:jiff-tzdb",
@@ -160,12 +159,3 @@ optional = true
[target.'cfg(not(target_family = "wasm"))'.dev-dependencies.hifitime]
version = "3.9.0"
-
-[target."cfg(windows)".dependencies.windows-sys]
-version = ">=0.52.0, <=0.59.*"
-features = [
- "Win32_Foundation",
- "Win32_System_Time",
-]
-optional = true
-default-features = false
diff --git a/vendor/libloading-0.8.5/Cargo.toml b/vendor/libloading-0.8.5/Cargo.toml diff --git a/vendor/libloading-0.8.5/Cargo.toml b/vendor/libloading-0.8.5/Cargo.toml
index 9fa2501..3eda5a2 100644 index 9fa2501..3eda5a2 100644
--- a/vendor/libloading-0.8.5/Cargo.toml --- a/vendor/libloading-0.8.5/Cargo.toml
@ -584,6 +609,52 @@ index 45f4a71..516644c 100644
-[target."cfg(windows)".dependencies.openssl-sys] -[target."cfg(windows)".dependencies.openssl-sys]
-version = "0.9.35" -version = "0.9.35"
-optional = true -optional = true
diff --git a/vendor/mio-0.8.11/Cargo.toml b/vendor/mio-0.8.11/Cargo.toml
index 5d112d9..1d30aa8 100644
--- a/vendor/mio-0.8.11/Cargo.toml
+++ b/vendor/mio-0.8.11/Cargo.toml
@@ -103,8 +103,6 @@ default = ["log"]
net = []
os-ext = [
"os-poll",
- "windows-sys/Win32_System_Pipes",
- "windows-sys/Win32_Security",
]
os-poll = []
@@ -116,13 +114,3 @@ version = "0.11.0"
[target."cfg(unix)".dependencies.libc]
version = "0.2.149"
-
-[target."cfg(windows)".dependencies.windows-sys]
-version = "0.48"
-features = [
- "Win32_Foundation",
- "Win32_Networking_WinSock",
- "Win32_Storage_FileSystem",
- "Win32_System_IO",
- "Win32_System_WindowsProgramming",
-]
diff --git a/vendor/notify-6.1.1/Cargo.toml b/vendor/notify-6.1.1/Cargo.toml
index 34600c9..2a4612e 100644
--- a/vendor/notify-6.1.1/Cargo.toml
+++ b/vendor/notify-6.1.1/Cargo.toml
@@ -107,14 +107,3 @@ optional = true
version = "0.8"
features = ["os-ext"]
optional = true
-
-[target."cfg(windows)".dependencies.windows-sys]
-version = "0.48.0"
-features = [
- "Win32_System_Threading",
- "Win32_Foundation",
- "Win32_Storage_FileSystem",
- "Win32_Security",
- "Win32_System_WindowsProgramming",
- "Win32_System_IO",
-]
diff --git a/vendor/nu-ansi-term-0.46.0/Cargo.toml b/vendor/nu-ansi-term-0.46.0/Cargo.toml diff --git a/vendor/nu-ansi-term-0.46.0/Cargo.toml b/vendor/nu-ansi-term-0.46.0/Cargo.toml
index 209e055..aa40f02 100644 index 209e055..aa40f02 100644
--- a/vendor/nu-ansi-term-0.46.0/Cargo.toml --- a/vendor/nu-ansi-term-0.46.0/Cargo.toml
@ -639,33 +710,6 @@ index 8d91b5e..2d7313b 100644
[target."cfg(target_os = \"linux\")".dependencies.bstr] [target."cfg(target_os = \"linux\")".dependencies.bstr]
version = "1" version = "1"
-[target."cfg(windows)".dependencies.winapi]
-version = "0.3"
-features = ["shellapi"]
-
[badges.appveyor]
branch = "master"
repository = "Seeker14491/opener"
diff --git a/vendor/opener-0.6.1/Cargo.toml b/vendor/opener-0.6.1/Cargo.toml
index 79b4be9..69cc269 100644
--- a/vendor/opener-0.6.1/Cargo.toml
+++ b/vendor/opener-0.6.1/Cargo.toml
@@ -40,8 +40,6 @@ version = "0.9"
reveal = [
"dep:url",
"dep:dbus",
- "winapi/shtypes",
- "winapi/objbase",
]
[target."cfg(target_os = \"linux\")".dependencies.bstr]
@@ -56,13 +54,6 @@ optional = true
version = "2"
optional = true
-[target."cfg(windows)".dependencies.normpath]
-version = "1"
-
-[target."cfg(windows)".dependencies.winapi] -[target."cfg(windows)".dependencies.winapi]
-version = "0.3" -version = "0.3"
-features = ["shellapi"] -features = ["shellapi"]
@ -733,19 +777,47 @@ index 3111f2b..c7a53ca 100644
- -
-[target."cfg(windows)".dependencies.windows-targets] -[target."cfg(windows)".dependencies.windows-targets]
-version = "0.52.0" -version = "0.52.0"
diff --git a/vendor/rustix-0.38.37/Cargo.toml b/vendor/rustix-0.38.37/Cargo.toml diff --git a/vendor/process-wrap-8.0.2/Cargo.toml b/vendor/process-wrap-8.0.2/Cargo.toml
index 9a8c175..986218e 100644 index d04598f..1f60c7e 100644
--- a/vendor/rustix-0.38.37/Cargo.toml --- a/vendor/process-wrap-8.0.2/Cargo.toml
+++ b/vendor/rustix-0.38.37/Cargo.toml +++ b/vendor/process-wrap-8.0.2/Cargo.toml
@@ -261,20 +261,6 @@ package = "errno" @@ -73,8 +73,6 @@ features = [
version = "1.5.2"
optional = true [features]
creation-flags = [
- "dep:windows",
- "windows/Win32_System_Threading",
]
default = [
"creation-flags",
@@ -85,12 +83,6 @@ default = [
"tracing",
]
job-object = [
- "dep:windows",
- "windows/Win32_Security",
- "windows/Win32_System_Diagnostics_ToolHelp",
- "windows/Win32_System_IO",
- "windows/Win32_System_JobObjects",
- "windows/Win32_System_Threading",
]
kill-on-drop = []
process-group = []
@@ -114,6 +106,3 @@ features = [
optional = true
default-features = false
-[target."cfg(windows)".dependencies.windows]
-version = "0.56.0"
-optional = true
diff --git a/vendor/rustix-0.38.38/Cargo.toml b/vendor/rustix-0.38.38/Cargo.toml
index 62530d9..602c240 100644
--- a/vendor/rustix-0.38.38/Cargo.toml
+++ b/vendor/rustix-0.38.38/Cargo.toml
@@ -266,15 +266,6 @@ version = "0.3.8"
default-features = false
package = "errno"
-[target."cfg(windows)".dependencies.libc_errno]
-version = "0.3.8"
-default-features = false
-package = "errno"
-
-[target."cfg(windows)".dependencies.windows-sys] -[target."cfg(windows)".dependencies.windows-sys]
-version = "0.52.0" -version = "0.52.0"
-features = [ -features = [
@ -768,10 +840,10 @@ index 4f66820..11ef472 100644
version = "0.3" version = "0.3"
-[target."cfg(windows)".dependencies.winapi-util] -[target."cfg(windows)".dependencies.winapi-util]
-version = "0.1.1" -version = "0.1.1"
diff --git a/vendor/snapbox-0.6.18/Cargo.toml b/vendor/snapbox-0.6.18/Cargo.toml diff --git a/vendor/snapbox-0.6.20/Cargo.toml b/vendor/snapbox-0.6.20/Cargo.toml
index 33fee34..08973da 100644 index 4c54741..8ea990c 100644
--- a/vendor/snapbox-0.6.18/Cargo.toml --- a/vendor/snapbox-0.6.20/Cargo.toml
+++ b/vendor/snapbox-0.6.18/Cargo.toml +++ b/vendor/snapbox-0.6.20/Cargo.toml
@@ -189,7 +189,6 @@ cmd = [ @@ -189,7 +189,6 @@ cmd = [
"dep:os_pipe", "dep:os_pipe",
"dep:wait-timeout", "dep:wait-timeout",
@ -949,17 +1021,17 @@ index f90eaca..d32db67 100644
- -
-[target."cfg(windows)".dependencies.winapi-util] -[target."cfg(windows)".dependencies.winapi-util]
-version = "0.1.3" -version = "0.1.3"
diff --git a/vendor/terminal_size-0.3.0/Cargo.toml b/vendor/terminal_size-0.3.0/Cargo.toml diff --git a/vendor/terminal_size-0.4.0/Cargo.toml b/vendor/terminal_size-0.4.0/Cargo.toml
index f810025..0fbe3a1 100644 index b97c4e9..a55f309 100644
--- a/vendor/terminal_size-0.3.0/Cargo.toml --- a/vendor/terminal_size-0.4.0/Cargo.toml
+++ b/vendor/terminal_size-0.3.0/Cargo.toml +++ b/vendor/terminal_size-0.4.0/Cargo.toml
@@ -30,10 +30,3 @@ repository = "https://github.com/eminence/terminal-size" @@ -44,10 +44,3 @@ path = "examples/get_size.rs"
[target."cfg(not(windows))".dependencies.rustix] [target."cfg(not(windows))".dependencies.rustix]
version = "0.38.0" version = "0.38.0"
features = ["termios"] features = ["termios"]
- -
-[target."cfg(windows)".dependencies.windows-sys] -[target."cfg(windows)".dependencies.windows-sys]
-version = "0.48.0" -version = "0.59.0"
-features = [ -features = [
- "Win32_Foundation", - "Win32_Foundation",
- "Win32_System_Console", - "Win32_System_Console",
@ -977,11 +1049,11 @@ index d248f4d..9bd9f37 100644
-features = ["handleapi", "processenv", "wincon", "winbase"] -features = ["handleapi", "processenv", "wincon", "winbase"]
[badges.cirrus-ci] [badges.cirrus-ci]
repository = "JohnTitor/termize" repository = "JohnTitor/termize"
diff --git a/vendor/tokio-1.40.0/Cargo.toml b/vendor/tokio-1.40.0/Cargo.toml diff --git a/vendor/tokio-1.41.0/Cargo.toml b/vendor/tokio-1.41.0/Cargo.toml
index fcc8aac..6cccd58 100644 index 5fb9856..d482d55 100644
--- a/vendor/tokio-1.40.0/Cargo.toml --- a/vendor/tokio-1.41.0/Cargo.toml
+++ b/vendor/tokio-1.40.0/Cargo.toml +++ b/vendor/tokio-1.41.0/Cargo.toml
@@ -699,11 +699,6 @@ net = [ @@ -703,11 +703,6 @@ net = [
"mio/os-ext", "mio/os-ext",
"mio/net", "mio/net",
"socket2", "socket2",
@ -993,7 +1065,7 @@ index fcc8aac..6cccd58 100644
] ]
process = [ process = [
"bytes", "bytes",
@@ -712,9 +707,6 @@ process = [ @@ -716,9 +711,6 @@ process = [
"mio/os-ext", "mio/os-ext",
"mio/net", "mio/net",
"signal-hook-registry", "signal-hook-registry",
@ -1003,7 +1075,7 @@ index fcc8aac..6cccd58 100644
] ]
rt = [] rt = []
rt-multi-thread = ["rt"] rt-multi-thread = ["rt"]
@@ -724,8 +716,6 @@ signal = [ @@ -728,8 +720,6 @@ signal = [
"mio/net", "mio/net",
"mio/os-ext", "mio/os-ext",
"signal-hook-registry", "signal-hook-registry",
@ -1012,7 +1084,7 @@ index fcc8aac..6cccd58 100644
] ]
sync = [] sync = []
test-util = [ test-util = [
@@ -791,14 +781,3 @@ features = [ @@ -798,14 +788,3 @@ features = [
"socket", "socket",
] ]
default-features = false default-features = false
@ -1027,13 +1099,13 @@ index fcc8aac..6cccd58 100644
- "Win32_Foundation", - "Win32_Foundation",
- "Win32_Security_Authorization", - "Win32_Security_Authorization",
-] -]
diff --git a/vendor/uuid-1.10.0/Cargo.toml b/vendor/uuid-1.10.0/Cargo.toml diff --git a/vendor/uuid-1.11.0/Cargo.toml b/vendor/uuid-1.11.0/Cargo.toml
index dd443e4..23219f1 100644 index 4355c0b..8d7065a 100644
--- a/vendor/uuid-1.10.0/Cargo.toml --- a/vendor/uuid-1.11.0/Cargo.toml
+++ b/vendor/uuid-1.10.0/Cargo.toml +++ b/vendor/uuid-1.11.0/Cargo.toml
@@ -194,7 +194,6 @@ version = "0.3" @@ -203,7 +203,6 @@ version = "0.3"
[target."cfg(target = \"wasm32-unknown-unknown\")".dev-dependencies.wasm-bindgen] [target.'cfg(target = "wasm32-unknown-unknown")'.dev-dependencies.wasm-bindgen]
version = "0.2" version = "0.2"
- -
[badges.is-it-maintained-issue-resolution] [badges.is-it-maintained-issue-resolution]

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(-) 2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs diff --git a/compiler/rustc_lint/src/builtin.rs b/compiler/rustc_lint/src/builtin.rs
index 8bd9c89..bac3bdb 100644 index bda982a..d996304 100644
--- a/compiler/rustc_lint/src/builtin.rs --- a/compiler/rustc_lint/src/builtin.rs
+++ b/compiler/rustc_lint/src/builtin.rs +++ b/compiler/rustc_lint/src/builtin.rs
@@ -2724,7 +2724,10 @@ declare_lint! { @@ -2750,7 +2750,10 @@ declare_lint! {
/// ### Example /// ### Example
/// ///
/// ```rust,compile_fail /// ```rust,compile_fail
@ -25,10 +25,10 @@ index 8bd9c89..bac3bdb 100644
/// ///
/// fn main() { /// fn main() {
diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs diff --git a/compiler/rustc_lint_defs/src/builtin.rs b/compiler/rustc_lint_defs/src/builtin.rs
index 23dc521..99e194e 100644 index 9036741..f902a69 100644
--- a/compiler/rustc_lint_defs/src/builtin.rs --- a/compiler/rustc_lint_defs/src/builtin.rs
+++ b/compiler/rustc_lint_defs/src/builtin.rs +++ b/compiler/rustc_lint_defs/src/builtin.rs
@@ -2929,11 +2929,13 @@ declare_lint! { @@ -2927,11 +2927,13 @@ declare_lint! {
/// ///
/// use std::arch::naked_asm; /// use std::arch::naked_asm;
/// ///

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

@ -8,10 +8,10 @@ Forwarded: no
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs diff --git a/src/bootstrap/src/core/config/tests.rs b/src/bootstrap/src/core/config/tests.rs
index 9c67010..d5d9e8a 100644 index 24f932a..65381ca 100644
--- a/src/bootstrap/src/core/config/tests.rs --- a/src/bootstrap/src/core/config/tests.rs
+++ b/src/bootstrap/src/core/config/tests.rs +++ b/src/bootstrap/src/core/config/tests.rs
@@ -46,6 +46,9 @@ fn download_ci_llvm() { @@ -56,6 +56,9 @@ fn download_ci_llvm() {
// - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487 // - https://github.com/rust-lang/rust/pull/109162#issuecomment-1496782487
#[test] #[test]
fn detect_src_and_out() { fn detect_src_and_out() {

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

@ -12,7 +12,7 @@ Forwarded: no
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email> Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
--- ---
src/tools/compiletest/src/command-list.rs | 1 + src/tools/compiletest/src/directive-list.rs | 1 +
src/tools/compiletest/src/header/tests.rs | 1 + src/tools/compiletest/src/header/tests.rs | 1 +
tests/crashes/115994.rs | 1 + tests/crashes/115994.rs | 1 +
tests/run-make/long-linker-command-lines/foo.rs | 7 +++++++ tests/run-make/long-linker-command-lines/foo.rs | 7 +++++++
@ -21,11 +21,11 @@ Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
tests/ui/threads-sendsync/mpsc_stress.rs | 1 + tests/ui/threads-sendsync/mpsc_stress.rs | 1 +
7 files changed, 13 insertions(+) 7 files changed, 13 insertions(+)
diff --git a/src/tools/compiletest/src/command-list.rs b/src/tools/compiletest/src/command-list.rs diff --git a/src/tools/compiletest/src/directive-list.rs b/src/tools/compiletest/src/directive-list.rs
index 4d57907..ed0ffe3 100644 index bdd0b80..f3546c7 100644
--- a/src/tools/compiletest/src/command-list.rs --- a/src/tools/compiletest/src/directive-list.rs
+++ b/src/tools/compiletest/src/command-list.rs +++ b/src/tools/compiletest/src/directive-list.rs
@@ -57,6 +57,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[ @@ -59,6 +59,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
"ignore-gnu", "ignore-gnu",
"ignore-haiku", "ignore-haiku",
"ignore-horizon", "ignore-horizon",
@ -34,10 +34,10 @@ index 4d57907..ed0ffe3 100644
"ignore-i686-pc-windows-msvc", "ignore-i686-pc-windows-msvc",
"ignore-illumos", "ignore-illumos",
diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs
index c3c9496..6d20f51 100644 index 4d75c38..7f09722 100644
--- a/src/tools/compiletest/src/header/tests.rs --- a/src/tools/compiletest/src/header/tests.rs
+++ b/src/tools/compiletest/src/header/tests.rs +++ b/src/tools/compiletest/src/header/tests.rs
@@ -282,6 +282,7 @@ fn ignore_target() { @@ -329,6 +329,7 @@ fn ignore_target() {
assert!(check_ignore(&config, "//@ ignore-x86_64-unknown-linux-gnu")); assert!(check_ignore(&config, "//@ ignore-x86_64-unknown-linux-gnu"));
assert!(check_ignore(&config, "//@ ignore-x86_64")); assert!(check_ignore(&config, "//@ ignore-x86_64"));
assert!(check_ignore(&config, "//@ ignore-linux")); assert!(check_ignore(&config, "//@ ignore-linux"));

4
debian/patches/upstream/u-ignore-ppc-hangs.patch vendored
View File

@ -9,7 +9,7 @@ Bug: https://github.com/rust-lang/rust/issues/89607
2 files changed, 2 insertions(+) 2 files changed, 2 insertions(+)
diff --git a/library/alloc/tests/arc.rs b/library/alloc/tests/arc.rs diff --git a/library/alloc/tests/arc.rs b/library/alloc/tests/arc.rs
index dc27c57..79c0670 100644 index a259c01..0ac0cbe 100644
--- a/library/alloc/tests/arc.rs --- a/library/alloc/tests/arc.rs
+++ b/library/alloc/tests/arc.rs +++ b/library/alloc/tests/arc.rs
@@ -95,6 +95,7 @@ const SHARED_ITER_MAX: u16 = 100; @@ -95,6 +95,7 @@ const SHARED_ITER_MAX: u16 = 100;
@ -21,7 +21,7 @@ index dc27c57..79c0670 100644
fn shared_from_iter_normal() { fn shared_from_iter_normal() {
// Exercise the base implementation for non-`TrustedLen` iterators. // Exercise the base implementation for non-`TrustedLen` iterators.
diff --git a/library/alloc/tests/rc.rs b/library/alloc/tests/rc.rs diff --git a/library/alloc/tests/rc.rs b/library/alloc/tests/rc.rs
index 29dbdcf..bebc0a0 100644 index 451765d..363c29c 100644
--- a/library/alloc/tests/rc.rs --- a/library/alloc/tests/rc.rs
+++ b/library/alloc/tests/rc.rs +++ b/library/alloc/tests/rc.rs
@@ -91,6 +91,7 @@ const SHARED_ITER_MAX: u16 = 100; @@ -91,6 +91,7 @@ const SHARED_ITER_MAX: u16 = 100;

28
debian/patches/vendor/blake3-skip-embedded-C-code-use-pure-implementation.patch vendored
View File

@ -9,16 +9,16 @@ Forwarded: not-needed
Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email> Signed-off-by: Fabian Grünbichler <git@fabian.gruenbichler.email>
--- ---
vendor/blake3-1.5.2/Cargo.toml | 2 +- vendor/blake3-1.5.4/Cargo.toml | 2 +-
vendor/blake3-1.5.2/build.rs | 18 ++++++++++++------ vendor/blake3-1.5.4/build.rs | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-) 2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/vendor/blake3-1.5.2/Cargo.toml b/vendor/blake3-1.5.2/Cargo.toml diff --git a/vendor/blake3-1.5.4/Cargo.toml b/vendor/blake3-1.5.4/Cargo.toml
index fe60aa7..5bc5644 100644 index b4b0e98..a801d25 100644
--- a/vendor/blake3-1.5.2/Cargo.toml --- a/vendor/blake3-1.5.4/Cargo.toml
+++ b/vendor/blake3-1.5.2/Cargo.toml +++ b/vendor/blake3-1.5.4/Cargo.toml
@@ -101,7 +101,7 @@ version = "3.8.0" @@ -109,7 +109,7 @@ version = "3.8.0"
version = "1.0.4" version = "1.1.12"
[features] [features]
-default = ["std"] -default = ["std"]
@ -26,11 +26,11 @@ index fe60aa7..5bc5644 100644
mmap = [ mmap = [
"std", "std",
"dep:memmap2", "dep:memmap2",
diff --git a/vendor/blake3-1.5.2/build.rs b/vendor/blake3-1.5.2/build.rs diff --git a/vendor/blake3-1.5.4/build.rs b/vendor/blake3-1.5.4/build.rs
index af5805d..e568aa2 100644 index 57f72b7..952b864 100644
--- a/vendor/blake3-1.5.2/build.rs --- a/vendor/blake3-1.5.4/build.rs
+++ b/vendor/blake3-1.5.2/build.rs +++ b/vendor/blake3-1.5.4/build.rs
@@ -271,7 +271,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> { @@ -275,7 +275,11 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
} }
if is_x86_64() || is_x86_32() { if is_x86_64() || is_x86_32() {
@ -43,7 +43,7 @@ index af5805d..e568aa2 100644
if is_x86_32() || should_prefer_intrinsics() || is_pure() || support == NoCompiler { if is_x86_32() || should_prefer_intrinsics() || is_pure() || support == NoCompiler {
build_sse2_sse41_avx2_rust_intrinsics(); build_sse2_sse41_avx2_rust_intrinsics();
} else { } else {
@@ -308,11 +312,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> { @@ -312,11 +316,13 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
println!("cargo:rerun-if-env-changed=CFLAGS"); println!("cargo:rerun-if-env-changed=CFLAGS");
// Ditto for source files, though these shouldn't change as often. // Ditto for source files, though these shouldn't change as often.

11
debian/patches/vendor/u-hurd-gix-index-2.patch vendored
View File

@ -1,18 +1,21 @@
From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net> From: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Wed, 19 Jun 2024 07:48:44 +0200 Date: Wed, 19 Jun 2024 07:48:44 +0200
Subject: u-hurd-gix-index-2 Subject: u-hurd-gix-index-2
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 8bit
To be removed with upgrade to libc ≥ 0.2.162 To be removed with upgrade to libc ≥ 0.2.162
=================================================================== ===================================================================
--- ---
vendor/gix-index-0.33.1/src/fs.rs | 6 +++++- vendor/gix-index-0.36.0/src/fs.rs | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/vendor/gix-index-0.33.1/src/fs.rs b/vendor/gix-index-0.33.1/src/fs.rs diff --git a/vendor/gix-index-0.36.0/src/fs.rs b/vendor/gix-index-0.36.0/src/fs.rs
index 5fb369f..2feff9d 100644 index 5fb369f..2feff9d 100644
--- a/vendor/gix-index-0.33.1/src/fs.rs --- a/vendor/gix-index-0.36.0/src/fs.rs
+++ b/vendor/gix-index-0.33.1/src/fs.rs +++ b/vendor/gix-index-0.36.0/src/fs.rs
@@ -117,10 +117,14 @@ impl Metadata { @@ -117,10 +117,14 @@ impl Metadata {
/// Return the device id on which the file is located, or 0 on windows. /// Return the device id on which the file is located, or 0 on windows.