Auto merge of rust-lang#137594 - RalfJung:miri-sync, r=RalfJung

bors · gitbot · commit fdd2b9413880 · 2025-03-11T09:46:41.000Z
Miri subtree update

r? `@ghost`

try-job: x86_64-gnu-aux
diff --git a/coretests/tests/num/int_log.rs b/coretests/tests/num/int_log.rs
@@ -34,6 +34,7 @@ fn checked_ilog() {
 }
 
 #[test]
+#[cfg_attr(miri, ignore)] // FIXME test is broken on Miri: https://github.com/rust-lang/rust/issues/137591
 fn checked_ilog2() {
     assert_eq!(5u32.checked_ilog2(), Some(2));
     assert_eq!(0u64.checked_ilog2(), None);

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ fn checked_ilog() {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`#[test]`
	`37`	`+#[cfg_attr(miri, ignore)] // FIXME test is broken on Miri: https://github.com/rust-lang/rust/issues/137591`
`37`	`38`	`fn checked_ilog2() {`
`38`	`39`	`assert_eq!(5u32.checked_ilog2(), Some(2));`
`39`	`40`	`assert_eq!(0u64.checked_ilog2(), None);`