rust: updated to 1.85.0

5 files changed, 73 insertions, 55 deletions

diff --git a/repos/extra/rust/.checksum b/repos/extra/rust/.checksum
index 26cca43c..54e6d999 100644
--- a/repos/extra/rust/.checksum
+++ b/repos/extra/rust/.checksum
@@ -1,8 +1,7 @@
-e532c42d7eb325d75c298596b6865636bc88ea0df21ee7d092b0e9ada65a301f  cargo-1.83.0-x86_64-unknown-linux-musl.tar.xz
-879b657d8928ddb722e1e5447d3d26aa5e5df8b31e55bf037348388b3005bb5e  fix-bootstrap.patch
-c03ac16dbb7aecb143e7cd701feb480862af63dbb044e0f0637eaff93758937f  fix-curl.patch
-fb0fef39b363d51813605394a68ba775dc6c9cc295bd9f9e718d0e13376bbdfc  fix-linux_musl_base.patch
+712f4eff75ea6ff0afff746c1d5b8d8bede52ca6eedd41895c655e895e8a1f9d  cargo-1.84.0-x86_64-unknown-linux-musl.tar.xz
+b4e721647f0261ef6b1e5858a557f01fcc6e8267808421d38f6e0124c5950f4b  fix-curl.patch
+98cd52ea1add75f87899eda742c302404eea756a27d9a62b6bb318db0c6b34ac  fix-linux_musl_base.patch
 cfe8a050a1acc17c735c5af1b86989b38f99c14bbff509739523ede8768c2eab  libressl.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
-ec87dbce94022019aeecf269e58bba8bc4face7d5ac8745f301a74683c065a51  rustc-1.84.1-src.tar.xz
+b9f7e6e6d1f8135eda3e21da5e8ce6f6209d5ed053f6c3a09a241c0dc5b1c278  rust-std-1.84.0-x86_64-unknown-linux-musl.tar.xz
+f56165047145bdd606fe8cacfa6813f177baa39ffb96a6766c4c8fa9f14714a5  rustc-1.84.0-x86_64-unknown-linux-musl.tar.xz
+c8dc6b5e305d448f339a9a9497b2d03f82933c5a815d0f2dd272380991ce4793  rustc-1.85.0-src.tar.xz
diff --git a/repos/extra/rust/.files b/repos/extra/rust/.files
index 0c1f74a3..322cff46 100644
--- a/repos/extra/rust/.files
+++ b/repos/extra/rust/.files
@@ -1,6 +1,4 @@
 drwxr-xr-x root/root    etc/
-drwxr-xr-x root/root    etc/bash_completion.d/
--rw-r--r-- root/root    etc/bash_completion.d/cargo.new
 drwxr-xr-x root/root    usr/
 drwxr-xr-x root/root    usr/bin/
 -rwxr-xr-x root/root    usr/bin/cargo
@@ -11,7 +9,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-ce439f79e4196a4c.so
+-rw-r--r-- root/root    usr/lib/librustc_driver-16ac7ed4edf29903.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/
@@ -32,27 +30,27 @@ 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-4defd4c410ff6459.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-5626cc85f927ec30.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-2ecd7722e2951db5.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-057efe2ac648c340.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-8ceeed3ede950727.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-8d3f7f658b3745fa.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-b828efa1ccb298b1.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-2b9c302811aa6f53.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-bb3e967bc2993f3c.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-38764946bf13de0e.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-da76feed4dc818ea.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-a09abacdfc4b0d9f.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-73ac8d6dd28b581d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-857513af4282987d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-ef80bf39f999aba7.rlib
--rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-ef80bf39f999aba7.so
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-47acc5df8282740d.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-69588b7802c44688.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-597bc04ab203e1f1.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-a808b4ed1df3c455.rlib
--rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-3bff95575100afb3.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liballoc-34f62b40891ae40c.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcfg_if-eaab13771ade59ca.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcompiler_builtins-c3df2eff79f4deaa.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libcore-0006f09ef502acdf.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libgetopts-7fe127b0b5805b0e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libhashbrown-5a632c154119cf5d.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/liblibc-aa5bfda11c17c3e3.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_abort-c27c7de28cc08336.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libpanic_unwind-8dd89d2de9a1dd3e.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libproc_macro-da9b0541bfd9a988.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_demangle-1069b24d440d9c19.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_alloc-983bf6e3d3b9c051.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_core-d6cb6c594e3cc16f.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/librustc_std_workspace_std-7fbd150216731368.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-cd30169a94af2a64.rlib
+-rwxr-xr-x root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd-cd30169a94af2a64.so
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libstd_detect-d4c8a6a0bd57a4b8.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libsysroot-426d560ac7a398f1.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libtest-6646ed76c342376f.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunicode_width-b704ccf07e2d76dc.rlib
+-rw-r--r-- root/root    usr/lib/rustlib/x86_64-unknown-linux-musl/lib/libunwind-046a8d51a8bacf16.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
diff --git a/repos/extra/rust/abuild b/repos/extra/rust/abuild
index f0e7d4fb..aa2f3fd7 100644
--- a/repos/extra/rust/abuild
+++ b/repos/extra/rust/abuild
@@ -1,9 +1,9 @@
 name=rust
-version=1.84.1
+version=1.85.0
 
 ##cat src/stage0.txt
-export _date=2024-11-28
-export _rustc=1.83.0
+export _date=2025-01-09
+export _rustc=1.84.0
 export _cargo=$_rustc
 ##
 
@@ -13,7 +13,6 @@ source="https://static.rust-lang.org/dist/${name}c-$version-src.tar.xz
 	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
 	fix-linux_musl_base.patch
-	fix-bootstrap.patch
 	libressl.patch
 	fix-curl.patch"
 build_dir=${name}c-$version-src
@@ -89,5 +88,6 @@ EOF
 	
 	rm -rf $PKG/usr/lib/rustlib/src/ \
 		$PKG/usr/share/zsh \
+		$PKG/etc/bash_completion.d \
 		$PKG/usr/lib/rustlib/uninstall.sh
 }
diff --git a/repos/extra/rust/fix-curl.patch b/repos/extra/rust/fix-curl.patch
index e0469d8d..b1067b3d 100644
--- a/repos/extra/rust/fix-curl.patch
+++ b/repos/extra/rust/fix-curl.patch
@@ -24,3 +24,16 @@ index 7d9a661..683354e 100644
          .define("CURL_DISABLE_DICT", None)
          .define("CURL_DISABLE_GOPHER", None)
          .define("CURL_DISABLE_IMAP", None)
+diff --git a/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs b/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
+index a451b24..363b314 100644
+--- a/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
++++ b/vendor/curl-sys-0.4.78+curl-8.11.0/build.rs
+@@ -117,6 +117,8 @@ fn main() {
+         .include("curl/lib")
+         .include("curl/include")
+         .define("BUILDING_LIBCURL", None)
++        .define("CURL_CA_BUNDLE", "\"/etc/ssl/cert.pem\"")
++        .define("CURL_CA_PATH", "\"/etc/ssl/certs\"")
+         .define("CURL_DISABLE_DICT", None)
+         .define("CURL_DISABLE_GOPHER", None)
+         .define("CURL_DISABLE_IMAP", None)
diff --git a/repos/extra/rust/fix-linux_musl_base.patch b/repos/extra/rust/fix-linux_musl_base.patch
index a9293008..acd156e1 100644
--- a/repos/extra/rust/fix-linux_musl_base.patch
+++ b/repos/extra/rust/fix-linux_musl_base.patch
@@ -1,12 +1,8 @@
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Sat, 08 Aug 2016 15:06:00 +0200
-Subject: [PATCH] Fix linux_musl_base for native musl host
-
-See https://github.com/rust-lang/rust/pull/40113
-
+diff --git a/compiler/rustc_target/src/spec/base/linux_musl.rs b/compiler/rustc_target/src/spec/base/linux_musl.rs
+index 1a854fe..7b0cc7b 100644
 --- a/compiler/rustc_target/src/spec/base/linux_musl.rs
 +++ b/compiler/rustc_target/src/spec/base/linux_musl.rs
-@@ -1,15 +1,12 @@
+@@ -1,12 +1,9 @@
 -use crate::spec::{LinkSelfContainedDefault, TargetOptions, base, crt_objects};
 +use crate::spec::{base, TargetOptions};
  
@@ -18,21 +14,16 @@ See https://github.com/rust-lang/rust/pull/40113
 -    base.post_link_objects_self_contained = crt_objects::post_musl_self_contained();
 -    base.link_self_contained = LinkSelfContainedDefault::InferredForMusl;
  
-     // These targets statically link libc by default
--    base.crt_static_default = true;
-+    base.crt_static_default = false;
- 
      base
  }
+diff --git a/compiler/rustc_target/src/spec/crt_objects.rs b/compiler/rustc_target/src/spec/crt_objects.rs
+index e3b6430..13a96e2 100644
 --- a/compiler/rustc_target/src/spec/crt_objects.rs
 +++ b/compiler/rustc_target/src/spec/crt_objects.rs
-@@ -58,28 +61,6 @@
-         (LinkOutputKind::StaticPicExe, &[obj]),
-         (LinkOutputKind::DynamicDylib, &[obj]),
-         (LinkOutputKind::StaticDylib, &[obj]),
--    ])
--}
--
+@@ -62,28 +62,6 @@ pub(super) fn all(obj: &'static str) -> CrtObjects {
+     ])
+ }
+ 
 -pub(super) fn pre_musl_self_contained() -> CrtObjects {
 -    new(&[
 -        (LinkOutputKind::DynamicNoPicExe, &["crt1.o", "crti.o", "crtbegin.o"]),
@@ -52,6 +43,23 @@ See https://github.com/rust-lang/rust/pull/40113
 -        (LinkOutputKind::StaticPicExe, &["crtendS.o", "crtn.o"]),
 -        (LinkOutputKind::DynamicDylib, &["crtendS.o", "crtn.o"]),
 -        (LinkOutputKind::StaticDylib, &["crtendS.o", "crtn.o"]),
-     ])
- }
+-    ])
+-}
+-
+ pub(super) fn pre_mingw_self_contained() -> CrtObjects {
+     new(&[
+         (LinkOutputKind::DynamicNoPicExe, &["crt2.o", "rsbegin.o"]),
+diff --git a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs
+index 8dcdc5b..25f53d6 100644
+--- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs
++++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs
+@@ -14,8 +14,7 @@ pub(crate) fn target() -> Target {
+         | SanitizerSet::MEMORY
+         | SanitizerSet::THREAD;
+     base.supports_xray = true;
+-    // FIXME(compiler-team#422): musl targets should be dynamically linked by default.
+-    base.crt_static_default = true;
++    base.crt_static_default = false;
  
+     Target {
+         llvm_target: "x86_64-unknown-linux-musl".into(),