about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2022-10-07 17:29:08 +0200
committerRalf Jung <post@ralfj.de>2022-10-07 17:29:08 +0200
commitc2adc2e2343ebed2dba1490b842719d4541bbf48 (patch)
tree89396e094592ecff1e93ef54647b86fe8b0d4775
parentbfd5bfe6ba007039eacb75ed087ef893bce70e77 (diff)
downloadrust-c2adc2e2343ebed2dba1490b842719d4541bbf48.tar.gz
rust-c2adc2e2343ebed2dba1490b842719d4541bbf48.zip
rustup
-rw-r--r--src/tools/miri/rust-version2
-rw-r--r--src/tools/miri/tests/fail/invalid_bool.rs1
-rw-r--r--src/tools/miri/tests/pass/issues/issue-miri-2433.rs4
3 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/miri/rust-version b/src/tools/miri/rust-version
index 78b9a110aa7..7729a184d32 100644
--- a/src/tools/miri/rust-version
+++ b/src/tools/miri/rust-version
@@ -1 +1 @@
-acb8934fd57b3c2740c4abac0a5728c2c9b1423b
+e42c4d7218b2596276152c5eb1e69335621f3086
diff --git a/src/tools/miri/tests/fail/invalid_bool.rs b/src/tools/miri/tests/fail/invalid_bool.rs
index dde414f4177..fe9bb3bed7f 100644
--- a/src/tools/miri/tests/fail/invalid_bool.rs
+++ b/src/tools/miri/tests/fail/invalid_bool.rs
@@ -2,7 +2,6 @@
 // Make sure we find these even with many checks disabled.
 //@compile-flags: -Zmiri-disable-alignment-check -Zmiri-disable-stacked-borrows -Zmiri-disable-validation
 
-
 fn main() {
     let b = unsafe { std::mem::transmute::<u8, bool>(2) };
     let _x = b == std::hint::black_box(true); //~ ERROR: interpreting an invalid 8-bit value as a bool
diff --git a/src/tools/miri/tests/pass/issues/issue-miri-2433.rs b/src/tools/miri/tests/pass/issues/issue-miri-2433.rs
index de719df0f1f..a8281d30bac 100644
--- a/src/tools/miri/tests/pass/issues/issue-miri-2433.rs
+++ b/src/tools/miri/tests/pass/issues/issue-miri-2433.rs
@@ -1,6 +1,8 @@
 #![feature(type_alias_impl_trait)]
 
-trait T { type Item; }
+trait T {
+    type Item;
+}
 
 type Alias<'a> = impl T<Item = &'a ()>;