Skip to content

Commit

Permalink
Auto merge of rust-lang#133205 - matthiaskrgr:rollup-xhhhp5u, r=matth…
Browse files Browse the repository at this point in the history
…iaskrgr

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
  • Loading branch information
bors committed Nov 19, 2024
2 parents 607b493 + 543667a commit cdf5486
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
3 changes: 3 additions & 0 deletions std/src/sync/rwlock/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion stdarch
Submodule stdarch updated from ff9a44 to e5e00a

0 comments on commit cdf5486

Please sign in to comment.