Skip to content

Commit f6c0700

Browse files
authored
Merge pull request #4151 from rust-lang/rustup-2025-01-26
Automatic Rustup
2 parents 94e390c + 6beeea6 commit f6c0700

File tree

4 files changed

+9
-5
lines changed

4 files changed

+9
-5
lines changed

ci/ci.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ function endgroup {
1414
begingroup "Building Miri"
1515

1616
# Global configuration
17-
export RUSTFLAGS="-D warnings"
17+
# We are getting some odd linker warnings on macOS, make sure they do not fail the build.
18+
# (See <https://github.com/rust-lang/rust/issues/136086>.)
19+
export RUSTFLAGS="-D warnings -A linker-messages"
1820
export CARGO_INCREMENTAL=0
1921
export CARGO_EXTRA_FLAGS="--locked"
2022

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
814ebca2931bd25384ade5018e1cbc403b13ec11
1+
2f0ad2a71e4a4528bb80bcb24bf8fa4e50cb87c2

tests/fail/rustc-error2.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ struct Struct<T>(T);
44
impl<T> std::ops::Deref for Struct<T> {
55
type Target = dyn Fn(T);
66
fn deref(&self) -> &assert_mem_uninitialized_valid::Target {
7-
//~^ERROR: undeclared crate or module
7+
//~^ERROR: use of unresolved module or unlinked crate
88
unimplemented!()
99
}
1010
}

tests/fail/rustc-error2.stderr

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
error[E0433]: failed to resolve: use of undeclared crate or module `assert_mem_uninitialized_valid`
1+
error[E0433]: failed to resolve: use of unresolved module or unlinked crate `assert_mem_uninitialized_valid`
22
--> tests/fail/rustc-error2.rs:LL:CC
33
|
44
LL | fn deref(&self) -> &assert_mem_uninitialized_valid::Target {
5-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use of undeclared crate or module `assert_mem_uninitialized_valid`
5+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ use of unresolved module or unlinked crate `assert_mem_uninitialized_valid`
6+
|
7+
= help: you might be missing a crate named `assert_mem_uninitialized_valid`
68

79
error: aborting due to 1 previous error
810

0 commit comments

Comments
 (0)