Merge pull request #4151 from rust-lang/rustup-2025-01-26

Automatic Rustup
rust-lang · Jan 26, 2025 · f6c0700 · f6c0700
2 parents 94e390c + 6beeea6
commit f6c0700
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/ci/ci.sh b/ci/ci.sh
@@ -14,7 +14,9 @@ function endgroup {
 begingroup "Building Miri"
 
 # Global configuration
-export RUSTFLAGS="-D warnings"
+# We are getting some odd linker warnings on macOS, make sure they do not fail the build.
+# (See <https://github.com/rust-lang/rust/issues/136086>.)
+export RUSTFLAGS="-D warnings -A linker-messages"
 export CARGO_INCREMENTAL=0
 export CARGO_EXTRA_FLAGS="--locked"
 

diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-814ebca2931bd25384ade5018e1cbc403b13ec11
+2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2
diff --git a/tests/fail/rustc-error2.rs b/tests/fail/rustc-error2.rs
@@ -4,7 +4,7 @@ struct Struct<T>(T);
 impl<T> std::ops::Deref for Struct<T> {
     type Target = dyn Fn(T);
     fn deref(&self) -> &assert_mem_uninitialized_valid::Target {
-        //~^ERROR: undeclared crate or module
+        //~^ERROR: use of unresolved module or unlinked crate
         unimplemented!()
     }
 }

diff --git a/tests/fail/rustc-error2.stderr b/tests/fail/rustc-error2.stderr
@@ -1,8 +1,10 @@
-error[E0433]: failed to resolve: use of undeclared crate or module `assert_mem_uninitialized_valid`
+error[E0433]: failed to resolve: use of unresolved module or unlinked crate `assert_mem_uninitialized_valid`
   --> tests/fail/rustc-error2.rs:LL:CC
    |
 LL |     fn deref(&self) -> &assert_mem_uninitialized_valid::Target {
-   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use of undeclared crate or module `assert_mem_uninitialized_valid`
+   |                         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use of unresolved module or unlinked crate `assert_mem_uninitialized_valid`
+   |
+   = help: you might be missing a crate named `assert_mem_uninitialized_valid`
 
 error: aborting due to 1 previous error
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		814ebca2931bd25384ade5018e1cbc403b13ec11
		2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2