Auto merge of #2103 - RalfJung:rustup, r=RalfJung

bors · bors · commit 3b8b6aa8b689 · 2022-05-06T15:28:39.000Z
rustup
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-18b53cefdf7456bf68937b08e377b7e622a115c2
+9a251644fa2adde5f46eea8d342b7e60e4716039
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
@@ -1,4 +1,4 @@
-#![feature(rustc_private, bool_to_option, stmt_expr_attributes)]
+#![feature(rustc_private, stmt_expr_attributes)]
 #![allow(clippy::manual_range_contains)]
 
 extern crate rustc_data_structures;
diff --git a/src/lib.rs b/src/lib.rs
@@ -4,7 +4,6 @@
 #![feature(never_type)]
 #![feature(try_blocks)]
 #![feature(let_else)]
-#![feature(bool_to_option)]
 #![feature(io_error_more)]
 #![warn(rust_2018_idioms)]
 #![allow(
diff --git a/tests/run-pass/stacked-borrows/2phase.rs b/tests/run-pass/stacked-borrows/2phase.rs
@@ -1,5 +1,4 @@
 // compile-flags: -Zmiri-tag-raw-pointers
-#![allow(mutable_borrow_reservation_conflict)]
 
 trait S: Sized {
     fn tpb(&mut self, _s: Self) {}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#![feature(rustc_private, bool_to_option, stmt_expr_attributes)]`
	`1`	`+#![feature(rustc_private, stmt_expr_attributes)]`
`2`	`2`	`#![allow(clippy::manual_range_contains)]`
`3`	`3`
`4`	`4`	`extern crate rustc_data_structures;`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// compile-flags: -Zmiri-tag-raw-pointers`
`2`		`-#![allow(mutable_borrow_reservation_conflict)]`
`3`	`2`
`4`	`3`	`trait S: Sized {`
`5`	`4`	`fn tpb(&mut self, _s: Self) {}`