Auto merge of rust-lang#133205 - matthiaskrgr:rollup-xhhhp5u, r=matthiaskrgr

bors · bors · commit cdf54869ec64 · 2024-11-19T16:31:58.000Z
Rollup of 4 pull requests Successful merges: - rust-lang#131081 (Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args`) - rust-lang#132577 (Report the `unexpected_cfgs` lint in external macros) - rust-lang#133023 (Merge `-Zhir-stats` into `-Zinput-stats`) - rust-lang#133200 (ignore an occasionally-failing test in Miri) r? `@ghost` `@rustbot` modify labels: rollup
diff --git a/std/src/sync/rwlock/tests.rs b/std/src/sync/rwlock/tests.rs
@@ -550,6 +550,9 @@ fn test_downgrade_observe() {
 }
 
 #[test]
+// FIXME: On macOS we use a provenance-incorrect implementation and Miri catches that issue.
+// See <https://github.com/rust-lang/rust/issues/121950> for details.
+#[cfg_attr(all(miri, target_os = "macos"), ignore)]
 fn test_downgrade_atomic() {
     const NEW_VALUE: i32 = -1;
 
diff --git a/stdarch b/stdarch
@@ -1 +1 @@
-Subproject commit ff9a4445038eae46fd095188740946808581bc0e
+Subproject commit e5e00aab0a8c8fa35fb7865e88fa82366f615c53

Original file line number	Diff line number	Diff line change
`@@ -550,6 +550,9 @@ fn test_downgrade_observe() {`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`#[test]`
	`553`	`+// FIXME: On macOS we use a provenance-incorrect implementation and Miri catches that issue.`
	`554`	`+// See <https://github.com/rust-lang/rust/issues/121950> for details.`
	`555`	`+#[cfg_attr(all(miri, target_os = "macos"), ignore)]`
`553`	`556`	`fn test_downgrade_atomic() {`
`554`	`557`	`const NEW_VALUE: i32 = -1;`
`555`	`558`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit ff9a4445038eae46fd095188740946808581bc0e`
	`1`	`+Subproject commit e5e00aab0a8c8fa35fb7865e88fa82366f615c53`