about summary refs log tree commit diff
diff options
context:
space:
mode:
authorYuki Okushi <jtitor@2k36.org>2022-10-10 00:09:43 +0900
committerGitHub <noreply@github.com>2022-10-10 00:09:43 +0900
commitf59e8afb66495b7a6cc2a7f28b71eb367acaf518 (patch)
treeea87d66d964bcdbf704bccf992c5dfa52e981599
parentdeb93ca060220e411e69788810a1da07da4bd72e (diff)
parentd47d3907037c7d7adb3e4f86f898ec42b1a7cd3a (diff)
downloadrust-f59e8afb66495b7a6cc2a7f28b71eb367acaf518.tar.gz
rust-f59e8afb66495b7a6cc2a7f28b71eb367acaf518.zip
Rollup merge of #102838 - RalfJung:miri-bootstrap, r=oli-obk
remove cfg(bootstrap) from Miri

Looks like this was forgotten in the bootstrap bump.

r? `@oli-obk`
-rw-r--r--src/tools/miri/cargo-miri/src/main.rs1
-rw-r--r--src/tools/miri/src/lib.rs1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/tools/miri/cargo-miri/src/main.rs b/src/tools/miri/cargo-miri/src/main.rs
index c43bf0bfab1..9b5fa7ae873 100644
--- a/src/tools/miri/cargo-miri/src/main.rs
+++ b/src/tools/miri/cargo-miri/src/main.rs
@@ -1,4 +1,3 @@
-#![cfg_attr(bootstrap, feature(let_else))]
 #![allow(clippy::useless_format, clippy::derive_partial_eq_without_eq, rustc::internal)]
 
 #[macro_use]
diff --git a/src/tools/miri/src/lib.rs b/src/tools/miri/src/lib.rs
index 461f6e4c0f6..e21dca7adc1 100644
--- a/src/tools/miri/src/lib.rs
+++ b/src/tools/miri/src/lib.rs
@@ -10,7 +10,6 @@
 #![feature(is_some_and)]
 #![feature(nonzero_ops)]
 #![feature(local_key_cell_methods)]
-#![cfg_attr(bootstrap, feature(let_else))]
 // Configure clippy and other lints
 #![allow(
     clippy::collapsible_else_if,