Update early-stage patches for 1.67.1+dfsg1

diff --git a/debian/patches/d-0000-ignore-removed-submodules.patch b/debian/patches/d-0000-ignore-removed-submodules.patch
index 7fdae2bd958c44cbb65dca11435207209ba06f4a..2a4136eae4f647c51f0cbb8e849c39953e2375cf 100644 (file)
--- a/debian/patches/d-0000-ignore-removed-submodules.patch
+++ b/debian/patches/d-0000-ignore-removed-submodules.patch
@@ -5,20 +5,20 @@ Subject: d-0000-ignore-removed-submodules
 ---
  Cargo.toml                         | 15 ---------------
  src/bootstrap/bootstrap.py         |  4 ----
- src/bootstrap/builder.rs           | 15 +--------------
+ src/bootstrap/builder.rs           | 17 +----------------
  src/bootstrap/doc.rs               |  1 -
  src/bootstrap/test.rs              | 12 +-----------
  src/tools/clippy/Cargo.toml        |  5 -----
  src/tools/rust-analyzer/Cargo.toml | 11 ++++++++++-
  src/tools/rustfmt/Cargo.toml       |  5 -----
  src/tools/tidy/src/deps.rs         |  2 +-
- 9 files changed, 13 insertions(+), 57 deletions(-)
+ 9 files changed, 13 insertions(+), 59 deletions(-)
 
 diff --git a/Cargo.toml b/Cargo.toml
-index e49fe5e..863c800 100644
+index 000c10a..7442a0e 100644
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -16,27 +16,15 @@ members = [
+@@ -17,27 +17,15 @@ members = [
    "src/tools/tidy",
    "src/tools/tier-check",
    "src/tools/build-manifest",
@@ -44,9 +44,9 @@ index e49fe5e..863c800 100644
 -  "src/tools/bump-stage0",
 -  "src/tools/replace-version-placeholder",
    "src/tools/lld-wrapper",
- ]
- 
-@@ -99,9 +87,6 @@ miniz_oxide.debug = 0
+   "src/tools/collect-license-metadata",
+   "src/tools/generate-copyright",
+@@ -102,9 +90,6 @@ miniz_oxide.debug = 0
  object.debug = 0
  
  [patch.crates-io]
@@ -57,10 +57,10 @@ index e49fe5e..863c800 100644
  # See comments in `library/rustc-std-workspace-core/README.md` for what's going on
  # here
 diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py
-index 5712868..5a6ab27 100644
+index 2d5018d..cc2ae13 100644
 --- a/src/bootstrap/bootstrap.py
 +++ b/src/bootstrap/bootstrap.py
-@@ -766,10 +766,6 @@ class RustBuild(object):
+@@ -767,10 +767,6 @@ class RustBuild(object):
                  os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")]
          for _ in range(0, self.verbose):
              args.append("--verbose")
@@ -72,10 +72,10 @@ index 5712868..5a6ab27 100644
              args.append("--features")
              args.append("build-metrics")
 diff --git a/src/bootstrap/builder.rs b/src/bootstrap/builder.rs
-index 8b144f1..c4bed1ec 100644
+index 8ee6d49..8bc92c8 100644
 --- a/src/bootstrap/builder.rs
 +++ b/src/bootstrap/builder.rs
-@@ -599,8 +599,6 @@ impl<'a> Builder<'a> {
+@@ -596,8 +596,6 @@ impl<'a> Builder<'a> {
                  tool::RemoteTestClient,
                  tool::RustInstaller,
                  tool::Cargo,
@@ -84,16 +84,18 @@ index 8b144f1..c4bed1ec 100644
                  tool::RustAnalyzerProcMacroSrv,
                  tool::RustDemangler,
                  tool::Rustdoc,
-@@ -621,8 +619,6 @@ impl<'a> Builder<'a> {
+@@ -618,10 +616,6 @@ impl<'a> Builder<'a> {
                  check::CodegenBackend,
                  check::Clippy,
                  check::Miri,
+-                check::CargoMiri,
+-                check::MiroptTestTools,
 -                check::Rls,
 -                check::RustAnalyzer,
                  check::Rustfmt,
                  check::Bootstrap
              ),
-@@ -650,7 +646,6 @@ impl<'a> Builder<'a> {
+@@ -650,7 +644,6 @@ impl<'a> Builder<'a> {
                  test::ReplacePlaceholderTest,
                  test::Cargotest,
                  test::Cargo,
@@ -101,7 +103,7 @@ index 8b144f1..c4bed1ec 100644
                  test::ErrorIndex,
                  test::Distcheck,
                  test::RunMakeFullDeps,
-@@ -698,10 +693,8 @@ impl<'a> Builder<'a> {
+@@ -698,10 +691,8 @@ impl<'a> Builder<'a> {
                  doc::RustdocBook,
                  doc::RustByExample,
                  doc::RustcBook,
@@ -112,7 +114,7 @@ index 8b144f1..c4bed1ec 100644
                  doc::EmbeddedBook,
                  doc::EditionGuide,
                  doc::StyleGuide,
-@@ -717,8 +710,6 @@ impl<'a> Builder<'a> {
+@@ -717,8 +708,6 @@ impl<'a> Builder<'a> {
                  dist::Analysis,
                  dist::Src,
                  dist::Cargo,
@@ -121,7 +123,7 @@ index 8b144f1..c4bed1ec 100644
                  dist::Rustfmt,
                  dist::RustDemangler,
                  dist::Clippy,
-@@ -739,7 +730,6 @@ impl<'a> Builder<'a> {
+@@ -739,7 +728,6 @@ impl<'a> Builder<'a> {
                  install::Docs,
                  install::Std,
                  install::Cargo,
@@ -129,7 +131,7 @@ index 8b144f1..c4bed1ec 100644
                  install::Rustfmt,
                  install::RustDemangler,
                  install::Clippy,
-@@ -2062,10 +2052,7 @@ impl<'a> Builder<'a> {
+@@ -1823,10 +1811,7 @@ impl<'a> Builder<'a> {
              }
          }
  
@@ -142,7 +144,7 @@ index 8b144f1..c4bed1ec 100644
          }
  
 diff --git a/src/bootstrap/doc.rs b/src/bootstrap/doc.rs
-index ea06caf..5d8247f 100644
+index 2c6fd1e..52c3eba 100644
 --- a/src/bootstrap/doc.rs
 +++ b/src/bootstrap/doc.rs
 @@ -74,7 +74,6 @@ macro_rules! book {
@@ -154,10 +156,10 @@ index ea06caf..5d8247f 100644
      EditionGuide, "src/doc/edition-guide", "edition-guide", submodule;
      EmbeddedBook, "src/doc/embedded-book", "embedded-book", submodule;
 diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
-index 791c35c..964e2e0 100644
+index 39cedfd..7ed7d97 100644
 --- a/src/bootstrap/test.rs
 +++ b/src/bootstrap/test.rs
-@@ -1909,17 +1909,7 @@ impl Step for RustcGuide {
+@@ -1975,17 +1975,7 @@ impl Step for RustcGuide {
      }
  
      fn run(self, builder: &Builder<'_>) {
@@ -177,7 +179,7 @@ index 791c35c..964e2e0 100644
  }
  
 diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index 60200a8..3980db9 100644
+index fe425a2..23beb15 100644
 --- a/src/tools/clippy/Cargo.toml
 +++ b/src/tools/clippy/Cargo.toml
 @@ -36,11 +36,6 @@ walkdir = "2.3"
@@ -229,10 +231,10 @@ index 7a4e02d..27b91f2 100644
  
  [package.metadata.rust-analyzer]
 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
-index 8a0239e..9b35cba 100644
+index 296db9d..0369861 100644
 --- a/src/tools/tidy/src/deps.rs
 +++ b/src/tools/tidy/src/deps.rs
-@@ -311,7 +311,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
+@@ -333,7 +333,7 @@ const FORBIDDEN_TO_HAVE_DUPLICATES: &[&str] = &[
      // This crate takes quite a long time to build, so don't allow two versions of them
      // to accidentally sneak into our dependency graph, in order to ensure we keep our CI times
      // under control.

diff --git a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
index 2fae76fe50ce81b3be641b5160fab69714e135b7..c544053bc85c97c6922134a2ea8ae854fc2137fb 100644 (file)
--- a/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
+++ b/debian/patches/d-0002-mdbook-strip-embedded-libs.patch
@@ -14,10 +14,10 @@ Comment: Use https://github.com/infinity0/mdBook/tree/debian to help you rebase
  7 files changed, 35 insertions(+), 203 deletions(-)
 
 diff --git a/src/tools/linkchecker/main.rs b/src/tools/linkchecker/main.rs
-index 7842611..4ccccf1 100644
+index 4170c32..d7dcda7 100644
 --- a/src/tools/linkchecker/main.rs
 +++ b/src/tools/linkchecker/main.rs
-@@ -183,7 +183,17 @@ impl Checker {
+@@ -159,7 +159,17 @@ impl Checker {
          for entry in t!(dir.read_dir()).map(|e| t!(e)) {
              let path = entry.path();
              // Goes through symlinks
@@ -36,7 +36,7 @@ index 7842611..4ccccf1 100644
              if metadata.is_dir() {
                  self.walk(&path, report);
              } else {
-@@ -196,7 +206,15 @@ impl Checker {
+@@ -172,7 +182,15 @@ impl Checker {
      fn check(&mut self, file: &Path, report: &mut Report) {
          let (pretty_path, entry) = self.load_file(file, report);
          let source = match entry {
@@ -53,7 +53,7 @@ index 7842611..4ccccf1 100644
              FileEntry::Dir => unreachable!("never with `check` path"),
              FileEntry::OtherFile => return,
              FileEntry::Redirect { .. } => return,
-@@ -262,6 +280,12 @@ impl Checker {
+@@ -238,6 +256,12 @@ impl Checker {
              let (target_pretty_path, target_entry) = self.load_file(&path, report);
              let (target_source, target_ids) = match target_entry {
                  FileEntry::Missing => {

diff --git a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
index 4d793cb81acf34ed1affbb0fd8182f991cf18e5c..9446070f061a396b99e04ae07600a42754cdd853 100644 (file)
--- a/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
+++ b/debian/patches/d-0003-cc-psm-rebuild-wasm32.patch
@@ -8,10 +8,10 @@ Subject: d-0003-cc-psm-rebuild-wasm32
  2 files changed, 3 insertions(+), 6 deletions(-)
 
 diff --git a/vendor/cc/src/lib.rs b/vendor/cc/src/lib.rs
-index e3a2b98..9312931 100644
+index a89e353..ccf99d2 100644
 --- a/vendor/cc/src/lib.rs
 +++ b/vendor/cc/src/lib.rs
-@@ -2238,7 +2238,7 @@ impl Build {
+@@ -2341,7 +2341,7 @@ impl Build {
                      || target == "wasm32-unknown-wasi"
                      || target == "wasm32-unknown-unknown"
                  {
@@ -21,7 +21,7 @@ index e3a2b98..9312931 100644
                      if self.cpp {
                          "wr-c++".to_string()
 diff --git a/vendor/psm/build.rs b/vendor/psm/build.rs
-index 01a13bf..30bd68d 100644
+index 9d40212..e39549d 100644
 --- a/vendor/psm/build.rs
 +++ b/vendor/psm/build.rs
 @@ -50,7 +50,7 @@ fn find_assembly(
@@ -30,10 +30,10 @@ index 01a13bf..30bd68d 100644
          ("riscv64", _, _, _) => Some(("src/arch/riscv64.s", true)),
 -        ("wasm32", _, _, _) => Some(("src/arch/wasm32.o", true)),
 +        ("wasm32", _, _, _) => Some(("src/arch/wasm32.s", true)),
+         ("loongarch64", _, _, _) => Some(("src/arch/loongarch64.s", true)),
          _ => None,
      }
- }
-@@ -94,11 +94,8 @@ fn main() {
+@@ -97,11 +97,8 @@ fn main() {
          cfg.define(&*format!("CFG_TARGET_ENV_{}", env), None);
      }
  

diff --git a/debian/patches/d-0004-clippy-feature-sync.patch b/debian/patches/d-0004-clippy-feature-sync.patch
index 64b1c3eedad40514b480765c829c8b4f0e7af53e..f92cfd4bd39e97fe04f7211f4f9c0bbda3e343f0 100644 (file)
--- a/debian/patches/d-0004-clippy-feature-sync.patch
+++ b/debian/patches/d-0004-clippy-feature-sync.patch
@@ -10,7 +10,7 @@ this is what rustc_workspace_hack does in the upstream build.
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/src/tools/clippy/Cargo.toml b/src/tools/clippy/Cargo.toml
-index 3980db9..fdf1a03 100644
+index 23beb15..ad8231a 100644
 --- a/src/tools/clippy/Cargo.toml
 +++ b/src/tools/clippy/Cargo.toml
 @@ -43,7 +43,7 @@ if_chain = "1.0"

diff --git a/debian/patches/d-0005-no-jemalloc.patch b/debian/patches/d-0005-no-jemalloc.patch
index 24ad1c6fdc607afce7f1a0c1c5b79080a1b34304..ac23de8bb288df9005bbe41b06307c1946aa054b 100644 (file)
--- a/debian/patches/d-0005-no-jemalloc.patch
+++ b/debian/patches/d-0005-no-jemalloc.patch
@@ -26,7 +26,7 @@ index 27ee3dd..87fb29f 100644
  max_level_info = ['rustc_driver/max_level_info']
  rustc_use_parallel_compiler = ['rustc_driver/rustc_use_parallel_compiler']
 diff --git a/src/tools/rust-analyzer/crates/profile/Cargo.toml b/src/tools/rust-analyzer/crates/profile/Cargo.toml
-index 5697aea..ae9bbd5 100644
+index 01d1735..bf0ba06 100644
 --- a/src/tools/rust-analyzer/crates/profile/Cargo.toml
 +++ b/src/tools/rust-analyzer/crates/profile/Cargo.toml
 @@ -15,7 +15,6 @@ cfg-if = "1.0.0"