Merge from rustc

The Miri Cronjob Bot · The Miri Cronjob Bot · commit d1722043a5b3 · 2025-04-29T06:23:41.000Z
diff --git a/tests/ui/checked_unwrap/simple_conditionals.stderr b/tests/ui/checked_unwrap/simple_conditionals.stderr
@@ -236,7 +236,7 @@ LL |     if result.is_ok() {
 LL |         result.as_mut().unwrap();
    |         ^^^^^^^^^^^^^^^^^^^^^^^^
 
-error: creating a shared reference to mutable static is discouraged
+error: creating a shared reference to mutable static
   --> tests/ui/checked_unwrap/simple_conditionals.rs:183:12
    |
 LL |         if X.is_some() {

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,7 @@ LL \| if result.is_ok() {`
`236`	`236`	`LL \| result.as_mut().unwrap();`
`237`	`237`	`\| ^^^^^^^^^^^^^^^^^^^^^^^^`
`238`	`238`
`239`		`-error: creating a shared reference to mutable static is discouraged`
	`239`	`+error: creating a shared reference to mutable static`
`240`	`240`	`--> tests/ui/checked_unwrap/simple_conditionals.rs:183:12`
`241`	`241`	`\|`
`242`	`242`	`LL \| if X.is_some() {`