rust: updated to 1.84.0

4 files changed, 48 insertions, 32 deletions

diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum
index da9239b1..ab1f8b4d 100644
--- a/repos/extra/rust/.checksum
+++ b/repos/extra/rust/.checksum
@@ -1,4 +1,5 @@
-1248a728a0ad46a2bf3e24a91489ec5eed0ca08f18e67a5bc3825e213fc62d63  cargo-1.82.0-x86_64-unknown-linux-musl.tar.xz
-b2f385e30700a6c30e0c598bedd1663935b4aa1436e2e322efe3cec457cfe258  rust-std-1.82.0-x86_64-unknown-linux-musl.tar.xz
-0ad6e2174f42dde6da3117027c226447b35116b9444b424ebceb41861cd1af9a  rustc-1.82.0-x86_64-unknown-linux-musl.tar.xz
-4e6212077b9a4760b75d4d87392e1d7ccc0099a47698bacbd6b5377d1d525484  rustc-1.83.0-src.tar.xz
+e532c42d7eb325d75c298596b6865636bc88ea0df21ee7d092b0e9ada65a301f  cargo-1.83.0-x86_64-unknown-linux-musl.tar.xz
+879b657d8928ddb722e1e5447d3d26aa5e5df8b31e55bf037348388b3005bb5e  fix-bootstrap.patch
+0421a2eb37e34e28fea9318b0771e79cd2f7c8da56272e40e41b5ee1e20b7b07  rust-std-1.83.0-x86_64-unknown-linux-musl.tar.xz
+34ef847a906f161bad351fa173d9c44f58cda6db3213717cd43b08c53b706eef  rustc-1.83.0-x86_64-unknown-linux-musl.tar.xz
+405fb455de32ca2303c743d94f9939700074e757bc08e25846b3055cf23e498e  rustc-1.84.0-src.tar.xz
diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files
index 3015e158..ae21095a 100644
--- a/repos/extra/rust/.files
+++ b/repos/extra/rust/.files
@@ -11,7 +11,7 @@ drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/rustc
 -rwxr-xr-x root/root    usr/bin/rustfmt
 drwxr-xr-x root/root    usr/lib/
--rw-r--r-- root/root    usr/lib/librustc_driver-096254ca4d825234.so
+-rw-r--r-- root/root    usr/lib/librustc_driver-d8e664d347e37fb1.so
 drwxr-xr-x root/root    usr/lib/rustlib/
 -rw-r--r-- root/root    usr/lib/rustlib/components
 drwxr-xr-x root/root    usr/lib/rustlib/etc/
@@ -29,29 +29,30 @@ drwxr-xr-x root/root    usr/lib/rustlib/etc/
 -rw-r--r-- root/root    usr/lib/rustlib/manifest-rustfmt-preview
 -rw-r--r-- root/root    usr/lib/rustlib/rust-installer-version
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/
+drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/bin/rust-objcopy
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-c15c32cd9c0a37ac.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-6fe8fead1eb94a98.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-f0e09456fbdd9317.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-cf24a9d6eedd18db.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-3b313cca9ff7c46d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-a3bd6a2a3166d426.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-b066bdcec7550347.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libmemchr-16b150c37405fd77.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-e7ac8ac235d090fd.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-4d6e1f92204bbf0f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-2b8b756d7b61f673.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-b8cbcc36bdc9c414.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-529181db8c68063f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-6c2225cf279582a3.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-1f950769457c9a4a.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-2b52c94a84c8106f.rlib
--rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-2b52c94a84c8106f.so
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-a3c117f6cf60c35d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-eaffa7e518dd0964.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-aa3a23f18ebef03f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-1cd0911817ec5da0.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-48b2a3d0bff9cf0a.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-070ebbf3d3cc8b6c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-43fea2fde5135f63.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-eadd944f4cf3a504.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-9bbfd88a1fe388f7.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-708ef84a02a23b8d.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-ed19b37131872ba6.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-56014f5b9576bd6d.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-899acdd70339a3b3.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-061b0cbf88dc757a.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-4087cb49e0d3fdc4.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-10ea966f78eeef18.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-f5f89fa36d0381d3.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-1435cdf3ac794deb.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-6ace3ecdd25873d8.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-2d02e09d83640c29.rlib
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-2d02e09d83640c29.so
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-79cfd35068e61699.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-efe6a78a5a69d37c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-2ff5651fa118157f.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-37d98732b1a88a32.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-a2a53a9a91a94c71.rlib
 drwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/Scrt1.o
 -rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/self-contained/crt1.o
@@ -100,7 +101,6 @@ drwxr-xr-x root/root    usr/share/man/man1/
 -rw-r--r-- root/root    usr/share/man/man1/cargo-uninstall.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/cargo-update.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/cargo-vendor.1.gz
--rw-r--r-- root/root    usr/share/man/man1/cargo-verify-project.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/cargo-version.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/cargo-yank.1.gz
 -rw-r--r-- root/root    usr/share/man/man1/cargo.1.gz
diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild
index d87d671f..35acd41b 100755
--- a/repos/extra/rust/abuild
+++ b/repos/extra/rust/abuild
@@ -1,9 +1,9 @@
 name=rust
-version=1.83.0
+version=1.84.0
 
 ##cat src/stage0.txt
-export _date=2024-10-17
-export _rustc=1.82.0
+export _date=2024-11-28
+export _rustc=1.83.0
 export _cargo=$_rustc
 ##
 
@@ -11,7 +11,8 @@ release=1
 source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
 	https://static.rust-lang.org/dist/$_date/rust-std-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
 	https://static.rust-lang.org/dist/$_date/rustc-$_rustc-x86_64-unknown-linux-musl.tar.xz::noextract
-	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz::noextract"
+	https://static.rust-lang.org/dist/$_date/cargo-$_cargo-x86_64-unknown-linux-musl.tar.xz::noextract
+	fix-bootstrap.patch"
 	#fix-curl.patch"
 build_dir=${name}c-$version-src
 keep_static=1
diff --git a/repos/extra/rust/fix-bootstrap.patch b/repos/extra/rust/fix-bootstrap.patch
new file mode 100755
index 00000000..9d945932
--- /dev/null
+++ b/repos/extra/rust/fix-bootstrap.patch
@@ -0,0 +1,14 @@
+diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
+index e706aba..35d69a6 100644
+--- a/src/bootstrap/src/core/config/config.rs
++++ b/src/bootstrap/src/core/config/config.rs
+@@ -2786,8 +2786,7 @@ impl Config {
+ 
+         // If `download-rustc` is not set, default to rebuilding.
+         let if_unchanged = match download_rustc {
+-            None => self.rust_info.is_managed_git_subrepository(),
+-            Some(StringOrBool::Bool(false)) => return None,
++            None | Some(StringOrBool::Bool(false)) => return None,
+             Some(StringOrBool::Bool(true)) => false,
+             Some(StringOrBool::String(s)) if s == "if-unchanged" => {
+                 if !self.rust_info.is_managed_git_subrepository() {