Update to 1.72.0

0001-Don-t-fail-early-if-try_run-returns-an-error.patch

@@ -0,0 +1,201 @@
+From 98336f8f6e701ea99275f32d6e2127a621041994 Mon Sep 17 00:00:00 2001
+From: Guillaume Gomez <guillaume.gomez@huawei.com>
+Date: Tue, 11 Jul 2023 17:01:35 +0200
+Subject: [PATCH] Don't fail early if `try_run` returns an error
+
+---
+ src/bootstrap/download.rs |  2 +-
+ src/bootstrap/run.rs      | 11 +++++------
+ src/bootstrap/test.rs     | 36 ++++++++++++++++--------------------
+ 3 files changed, 22 insertions(+), 27 deletions(-)
+
+diff --git a/src/bootstrap/download.rs b/src/bootstrap/download.rs
+index cb40521dda76..9478ac7d9cea 100644
+--- a/src/bootstrap/download.rs
++++ b/src/bootstrap/download.rs
+@@ -188,7 +188,7 @@ fn fix_bin_or_dylib(&self, fname: &Path) {
+             patchelf.args(&["--set-interpreter", dynamic_linker.trim_end()]);
+         }
+ 
+-        self.try_run(patchelf.arg(fname)).unwrap();
++        let _ = self.try_run(patchelf.arg(fname));
+     }
+ 
+     fn download_file(&self, url: &str, dest_path: &Path, help_on_error: &str) {
+diff --git a/src/bootstrap/run.rs b/src/bootstrap/run.rs
+index c97b75927371..70b917000433 100644
+--- a/src/bootstrap/run.rs
++++ b/src/bootstrap/run.rs
+@@ -27,8 +27,7 @@ fn run(self, builder: &Builder<'_>) {
+         try_run(
+             builder,
+             &mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("generate").arg(&builder.src),
+-        )
+-        .unwrap();
++        );
+     }
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+@@ -40,17 +39,17 @@ fn make_run(run: RunConfig<'_>) {
+     }
+ }
+ 
+-fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> Result<(), ()> {
++fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> bool {
+     if !builder.fail_fast {
+-        if let Err(e) = builder.try_run(cmd) {
++        if builder.try_run(cmd).is_err() {
+             let mut failures = builder.delayed_failures.borrow_mut();
+             failures.push(format!("{:?}", cmd));
+-            return Err(e);
++            return false;
+         }
+     } else {
+         builder.run(cmd);
+     }
+-    Ok(())
++    true
+ }
+ 
+ #[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]
+diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
+index 0907291b54da..13576aa787b6 100644
+--- a/src/bootstrap/test.rs
++++ b/src/bootstrap/test.rs
+@@ -48,17 +48,17 @@
+     // build for, so there is no entry for "aarch64-apple-darwin" here.
+ ];
+ 
+-fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> Result<(), ()> {
++fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> bool {
+     if !builder.fail_fast {
+-        if let Err(e) = builder.try_run(cmd) {
++        if builder.try_run(cmd).is_err() {
+             let mut failures = builder.delayed_failures.borrow_mut();
+             failures.push(format!("{:?}", cmd));
+-            return Err(e);
++            return false;
+         }
+     } else {
+         builder.run(cmd);
+     }
+-    Ok(())
++    true
+ }
+ 
+ fn try_run_quiet(builder: &Builder<'_>, cmd: &mut Command) -> bool {
+@@ -187,8 +187,7 @@ fn run(self, builder: &Builder<'_>) {
+         try_run(
+             builder,
+             builder.tool_cmd(Tool::Linkchecker).arg(builder.out.join(host.triple).join("doc")),
+-        )
+-        .unwrap();
++        );
+     }
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+@@ -241,8 +240,7 @@ fn run(self, builder: &Builder<'_>) {
+         builder.default_doc(&[]);
+         builder.ensure(crate::doc::Rustc::new(builder.top_stage, self.target, builder));
+ 
+-        try_run(builder, builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)))
+-            .unwrap();
++        try_run(builder, builder.tool_cmd(Tool::HtmlChecker).arg(builder.doc_out(self.target)));
+     }
+ }
+ 
+@@ -288,8 +286,7 @@ fn run(self, builder: &Builder<'_>) {
+                 .args(builder.config.test_args())
+                 .env("RUSTC", builder.rustc(compiler))
+                 .env("RUSTDOC", builder.rustdoc(compiler)),
+-        )
+-        .unwrap();
++        );
+     }
+ }
+ 
+@@ -855,7 +852,7 @@ fn run(self, builder: &Builder<'_>) {
+                 util::lld_flag_no_threads(self.compiler.host.contains("windows")),
+             );
+         }
+-        try_run(builder, &mut cmd).unwrap();
++        try_run(builder, &mut cmd);
+     }
+ }
+ 
+@@ -1106,7 +1103,7 @@ fn run(self, builder: &Builder<'_>) {
+         }
+ 
+         builder.info("tidy check");
+-        try_run(builder, &mut cmd).unwrap();
++        try_run(builder, &mut cmd);
+ 
+         builder.ensure(ExpandYamlAnchors);
+ 
+@@ -1154,8 +1151,7 @@ fn run(self, builder: &Builder<'_>) {
+         try_run(
+             builder,
+             &mut builder.tool_cmd(Tool::ExpandYamlAnchors).arg("check").arg(&builder.src),
+-        )
+-        .unwrap();
++        );
+     }
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+@@ -1948,7 +1944,7 @@ fn run_ext_doc(self, builder: &Builder<'_>) {
+             compiler.host,
+         );
+         let _time = util::timeit(&builder);
+-        let toolstate = if try_run(builder, &mut rustbook_cmd).is_ok() {
++        let toolstate = if try_run(builder, &mut rustbook_cmd) {
+             ToolState::TestPass
+         } else {
+             ToolState::TestFail
+@@ -2106,7 +2102,7 @@ fn markdown_test(builder: &Builder<'_>, compiler: Compiler, markdown: &Path) ->
+     cmd.arg("--test-args").arg(test_args);
+ 
+     if builder.config.verbose_tests {
+-        try_run(builder, &mut cmd).is_ok()
++        try_run(builder, &mut cmd)
+     } else {
+         try_run_quiet(builder, &mut cmd)
+     }
+@@ -2134,7 +2130,7 @@ fn run(self, builder: &Builder<'_>) {
+ 
+         let src = builder.src.join(relative_path);
+         let mut rustbook_cmd = builder.tool_cmd(Tool::Rustbook);
+-        let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)).is_ok() {
++        let toolstate = if try_run(builder, rustbook_cmd.arg("linkcheck").arg(&src)) {
+             ToolState::TestPass
+         } else {
+             ToolState::TestFail
+@@ -2684,7 +2680,7 @@ fn run(self, builder: &Builder<'_>) {
+             .current_dir(builder.src.join("src/bootstrap/"));
+         // NOTE: we intentionally don't pass test_args here because the args for unittest and cargo test are mutually incompatible.
+         // Use `python -m unittest` manually if you want to pass arguments.
+-        try_run(builder, &mut check_bootstrap).unwrap();
++        try_run(builder, &mut check_bootstrap);
+ 
+         let host = builder.config.build;
+         let compiler = builder.compiler(0, host);
+@@ -2756,7 +2752,7 @@ fn run(self, builder: &Builder<'_>) {
+         }
+ 
+         builder.info("platform support check");
+-        try_run(builder, &mut cargo.into()).unwrap();
++        try_run(builder, &mut cargo.into());
+     }
+ }
+ 
+@@ -2836,7 +2832,7 @@ fn run(self, builder: &Builder<'_>) {
+         cmd.env("CARGO", &builder.initial_cargo);
+         cmd.env("RUSTC", &builder.initial_rustc);
+         cmd.env("TMP_DIR", &tmpdir);
+-        try_run(builder, &mut cmd).unwrap();
++        try_run(builder, &mut cmd);
+     }
+ 
+     fn should_run(run: ShouldRun<'_>) -> ShouldRun<'_> {
+-- 
+2.41.0
+

0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch

@@ -0,0 +1,32 @@
+From ab9c5148956c2b7d177cc94533370d6a01a8d15f Mon Sep 17 00:00:00 2001
+From: Josh Stone <jistone@redhat.com>
+Date: Tue, 22 Aug 2023 10:42:12 -0700
+Subject: [PATCH] Skip ExpandYamlAnchors when the config is missing
+
+The dist-src tarball does not include `.github/` at all, so we can't
+check whether it needs to be regenerated.
+
+(cherry picked from commit 35187c7e6474d346eea3113c4ae34d26d6b18756)
+---
+ src/bootstrap/test.rs | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
+index eed7a584b603..d41850783c6d 100644
+--- a/src/bootstrap/test.rs
++++ b/src/bootstrap/test.rs
+@@ -1150,6 +1150,11 @@ impl Step for ExpandYamlAnchors {
+     /// appropriate configuration for all our CI providers. This step ensures the tool was called
+     /// by the user before committing CI changes.
+     fn run(self, builder: &Builder<'_>) {
++        // Note: `.github/` is not included in dist-src tarballs
++        if !builder.src.join(".github/workflows/ci.yml").exists() {
++            builder.info("Skipping YAML anchors check: GitHub Actions config not found");
++            return;
++        }
+         builder.info("Ensuring the YAML anchors in the GitHub Actions config were expanded");
+         try_run(
+             builder,
+-- 
+2.41.0
+

0001-add-musl-root-riscv64gc-detection-in-configure.py.patch

@@ -1,25 +0,0 @@
-From a216df759724049385b729f038de2cb49c580cd2 Mon Sep 17 00:00:00 2001
-From: jchzhou <zhoujiacheng@iscas.ac.cn>
-Date: Wed, 8 Mar 2023 00:10:42 +0800
-Subject: [PATCH] add musl-root-riscv64gc detection in configure.py
-
----
- src/bootstrap/configure.py | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/bootstrap/configure.py b/src/bootstrap/configure.py
-index 6b139decb..55855f8a1 100755
---- a/src/bootstrap/configure.py
-+++ b/src/bootstrap/configure.py
-@@ -140,6 +140,8 @@ v("musl-root-mips64", "target.mips64-unknown-linux-muslabi64.musl-root",
-   "mips64-unknown-linux-muslabi64 install directory")
- v("musl-root-mips64el", "target.mips64el-unknown-linux-muslabi64.musl-root",
-   "mips64el-unknown-linux-muslabi64 install directory")
-+v("musl-root-riscv64gc", "target.riscv64gc-unknown-linux-musl.musl-root",
-+  "riscv64gc-unknown-linux-musl install directory")
- v("qemu-armhf-rootfs", "target.arm-unknown-linux-gnueabihf.qemu-rootfs",
-   "rootfs in qemu testing, you probably don't want to use this")
- v("qemu-aarch64-rootfs", "target.aarch64-unknown-linux-gnu.qemu-rootfs",
--- 
-2.39.2
-

0002-fix-version-comparison-bug.patch

@@ -1,32 +0,0 @@
-From 31a81a08786826cc6e832bd0b49fb8b934e29648 Mon Sep 17 00:00:00 2001
-From: Ariadne Conill <ariadne@dereferenced.org>
-Date: Thu, 3 Aug 2023 15:05:40 -0700
-Subject: [PATCH] bootstrap: config: fix version comparison bug
-
-Rust requires a previous version of Rust to build, such as the current version, or the
-previous version.  However, the version comparison logic did not take patch releases
-into consideration when doing the version comparison for the current branch, e.g.
-Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version
-match, or the previous version.
-
-Adjust the version comparison logic to tolerate mismatches in the patch version.
-
-Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
----
- src/bootstrap/config.rs | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/bootstrap/config.rs b/src/bootstrap/config.rs
-index 45bea9608fc82..f283b2eb7e9ce 100644
---- a/src/bootstrap/config.rs
-+++ b/src/bootstrap/config.rs
-@@ -2004,7 +2004,8 @@ impl Config {
-                 .unwrap();
-         if !(source_version == rustc_version
-             || (source_version.major == rustc_version.major
--                && source_version.minor == rustc_version.minor + 1))
-+                && (source_version.minor == rustc_version.minor
-+                    || source_version.minor == rustc_version.minor + 1)))
-         {
-             let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
-             eprintln!(

rust.spec

@@ -1,7 +1,7 @@
-%global bootstrap_rust 1.70.0
+%global bootstrap_rust 1.71.0
-%global bootstrap_cargo 1.70.0
+%global bootstrap_cargo 1.71.0
-%global bootstrap_channel 1.70.0
+%global bootstrap_channel 1.71.0
-%global bootstrap_date 2023-06-01
+%global bootstrap_date 2023-07-13
 %bcond_with llvm_static
 %bcond_with bundled_llvm
 %bcond_without bundled_libgit2
@@ -11,7 +11,7 @@
 %bcond_without analyzer
 
 Name:                rust
-Version:             1.71.1
+Version:             1.72.0
 Release:             1
 Summary:             The Rust Programming Language
 License:             (ASL 2.0 or MIT) and (BSD and MIT)
@@ -22,17 +22,21 @@ Source1:             cargo-config
 Source2:             cargo-config.sh
 Source3:             cargo-config.csh
 
-Patch0000:           rustc-1.71.0-disable-libssh2.patch
+Patch0000:           rustc-1.72.0-disable-libssh2.patch
-Patch0001:           rustc-1.71.0-disable-http2.patch
+Patch0001:           rustc-1.72.0-disable-http2.patch
 Patch0002:           clippy-driver-usage-should-user-friendly.patch
 Patch0003:           cargo-help-clippy-should-have-description-to-user.patch
 Patch0004:           fix-a-println-wrong-format.patch
+# Fix --no-fail-fast
+# https://github.com/rust-lang/rust/pull/113214
+Patch0005:           0001-Don-t-fail-early-if-try_run-returns-an-error.patch
+# The dist-src tarball doesn't include .github/
+# https://github.com/rust-lang/rust/pull/115109
+Patch0006:           0001-Skip-ExpandYamlAnchors-when-the-config-is-missing.patch
 # By default, rust tries to use "rust-lld" as a linker for WebAssembly.
 Patch0007:           0001-Use-lld-provided-by-system-for-wasm.patch
 # Set a substitute-path in rust-gdb for standard library sources.
 Patch0008:           rustc-1.70.0-rust-gdb-substitute-path.patch
-# https://github.com/rust-lang/rust/pull/114440
-Patch0009:           0002-fix-version-comparison-bug.patch
 
 %{lua: function rust_triple(arch)
   local abi = "gnu"
@@ -257,9 +261,10 @@ sed -i.try-python -e '/^try python3 /i try "%{python}" "$@"' ./configure
 %patch -P 0002 -p1
 %patch -P 0003 -p1
 %patch -P 0004 -p1
+%patch -P 0005 -p1
+%patch -P 0006 -p1
 %patch -P 0007 -p1
 %patch -P 0008 -p1
-%patch -P 0009 -p1
 rm -rf vendor/curl-sys*/curl/
 rm -rf vendor/jemalloc-sys/jemalloc/
 rm -rf vendor/libffi-sys*/libffi/
@@ -488,6 +493,9 @@ export %{rust_env}
 %{_mandir}/man1/cargo*.1*
 
 %changelog
+* Mon Aug 28 2023 jchzhou <zhoujiacheng@iscas.ac.cn> - 1.72.0-1
+- Update to 1.72.0
+
 * Mon Aug 7 2023 Funda Wang <fundawang@yeah.net> - 1.71.1-1
 - New version 1.71.1
 

rustc-1.71.1-src.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:371af0fbe04051e20a74dbea6d4e4e548f10f15309c49cae2688afb882b6c7f1
-size 151983068

rustc-1.72.0-disable-http2.patch

@@ -1,6 +1,6 @@
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-07-07 17:30:04.817452621 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-08-21 11:00:15.341608892 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-07-07 17:30:27.777988139 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-08-21 11:00:46.074984901 -0700
-@@ -734,7 +734,6 @@
+@@ -743,7 +743,6 @@
  dependencies = [
   "cc",
   "libc",
@@ -8,8 +8,8 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -1954,16 +1953,6 @@
+@@ -2011,16 +2010,6 @@
- checksum = "348108ab3fba42ec82ff6e9564fc4ca0247bdccdc68dd8af9764bbc79c3c8ffb"
+ checksum = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4"
  
  [[package]]
 -name = "libnghttp2-sys"
@@ -23,10 +23,10 @@
 -
 -[[package]]
  name = "libz-sys"
- version = "1.1.8"
+ version = "1.1.9"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-07-07 17:30:04.819452581 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-08-21 11:00:15.341608892 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-07-07 17:30:24.133061874 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-08-21 11:00:15.342608871 -0700
 @@ -118,7 +118,7 @@
  cargo-util.workspace = true
  clap = { workspace = true, features = ["wrap_help"] }
@@ -36,9 +36,9 @@
  curl-sys.workspace = true
  env_logger.workspace = true
  filetime.workspace = true
---- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-06-24 10:27:37.000000000 -0700
+--- rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs.orig	2023-08-17 20:58:39.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-07-07 17:30:04.819452581 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/core/package.rs	2023-08-21 11:00:15.343608851 -0700
-@@ -407,16 +407,9 @@
+@@ -408,16 +408,9 @@
          sources: SourceMap<'cfg>,
          config: &'cfg Config,
      ) -> CargoResult<PackageSet<'cfg>> {
@@ -58,9 +58,9 @@
  
          Ok(PackageSet {
              packages: package_ids
---- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-06-24 10:27:37.000000000 -0700
+--- rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs.orig	2023-08-17 20:58:39.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-07-07 17:30:04.819452581 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/sources/registry/http_remote.rs	2023-08-21 11:00:15.343608851 -0700
-@@ -229,16 +229,8 @@
+@@ -250,16 +250,8 @@
          }
          self.fetch_started = true;
  
@@ -79,14 +79,14 @@
  
          if !self.quiet {
              self.config
---- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-06-24 10:27:37.000000000 -0700
+--- rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs.orig	2023-08-21 11:00:15.343608851 -0700
-+++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-07-07 17:30:04.819452581 -0700
++++ rustc-beta-src/src/tools/cargo/src/cargo/util/network/mod.rs	2023-08-21 11:02:01.969443986 -0700
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
  macro_rules! try_old_curl {
      ($e:expr, $msg:expr) => {
          let result = $e;
 -        if cfg!(target_os = "macos") {
 +        if cfg!(any(target_os = "linux", target_os = "macos")) {
              if let Err(e) = result {
-                 warn!("ignoring libcurl {} error: {}", $msg, e);
+                 ::log::warn!("ignoring libcurl {} error: {}", $msg, e);
              }

rustc-1.72.0-disable-libssh2.patch

@@ -1,6 +1,6 @@
---- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-06-24 10:27:37.000000000 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.lock.orig	2023-08-17 20:58:39.000000000 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-07-07 17:12:23.406932870 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.lock	2023-08-21 10:52:50.520622927 -0700
-@@ -1942,7 +1942,6 @@
+@@ -1999,7 +1999,6 @@
  dependencies = [
   "cc",
   "libc",
@@ -8,7 +8,7 @@
   "libz-sys",
   "openssl-sys",
   "pkg-config",
-@@ -1965,20 +1964,6 @@
+@@ -2022,20 +2021,6 @@
  ]
  
  [[package]]
@@ -27,10 +27,10 @@
 -
 -[[package]]
  name = "libz-sys"
- version = "1.1.8"
+ version = "1.1.9"
  source = "registry+https://github.com/rust-lang/crates.io-index"
---- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-06-24 10:27:37.000000000 -0700
+--- rustc-beta-src/src/tools/cargo/Cargo.toml.orig	2023-08-21 10:49:34.852578202 -0700
-+++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-07-07 17:12:00.688392750 -0700
++++ rustc-beta-src/src/tools/cargo/Cargo.toml	2023-08-21 10:52:11.858404449 -0700
 @@ -31,7 +31,7 @@
  filetime = "0.2.9"
  flate2 = { version = "1.0.3", default-features = false, features = ["zlib"] }
@@ -38,5 +38,5 @@
 -git2 = "0.17.1"
 +git2 = { version = "0.17.1", default-features = false, features = ["https"] }
  git2-curl = "0.18.0"
- gix = { version = "0.44.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
+ gix = { version = "0.45.1", default-features = false, features = ["blocking-http-transport-curl", "progress-tree"] }
- gix-features-for-configuration-only = { version = "0.29.0", package = "gix-features", features = [ "parallel" ] }
+ gix-features-for-configuration-only = { version = "0.30.0", package = "gix-features", features = [ "parallel" ] }

rustc-1.72.0-src.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d307441f8ee78a7e94f72cb5c81383822f13027f79e67a5551bfd2c2d2db3014
+size 151630408