From 02f193059528c6dd93f042ce277094f1d14cae77 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 19 Mar 2024 09:34:31 -0400
Subject: step cfgs

---
 src/tools/compiletest/src/header/tests.rs | 9 ---------
 src/tools/rustfmt/src/source_file.rs      | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/compiletest/src/header/tests.rs b/src/tools/compiletest/src/header/tests.rs
index cf300fbe74f..83f0755b5c8 100644
--- a/src/tools/compiletest/src/header/tests.rs
+++ b/src/tools/compiletest/src/header/tests.rs
@@ -537,15 +537,9 @@ fn wasm_special() {
         ("wasm32-wasi", "wasm32", true),
         ("wasm32-wasi", "wasm32-bare", false),
         ("wasm32-wasi", "wasi", true),
-        // NB: the wasm32-wasip1 target is new so this isn't tested for
-        // the bootstrap compiler.
-        #[cfg(not(bootstrap))]
         ("wasm32-wasip1", "emscripten", false),
-        #[cfg(not(bootstrap))]
         ("wasm32-wasip1", "wasm32", true),
-        #[cfg(not(bootstrap))]
         ("wasm32-wasip1", "wasm32-bare", false),
-        #[cfg(not(bootstrap))]
         ("wasm32-wasip1", "wasi", true),
         ("wasm64-unknown-unknown", "emscripten", false),
         ("wasm64-unknown-unknown", "wasm32", false),
@@ -604,11 +598,8 @@ fn threads_support() {
         ("aarch64-apple-darwin", true),
         ("wasm32-unknown-unknown", false),
         ("wasm64-unknown-unknown", false),
-        #[cfg(not(bootstrap))]
         ("wasm32-wasip1", false),
-        #[cfg(not(bootstrap))]
         ("wasm32-wasip1-threads", true),
-        ("wasm32-wasi-preview1-threads", true),
     ];
     for (target, has_threads) in threads {
         let config = cfg().target(target).build();
diff --git a/src/tools/rustfmt/src/source_file.rs b/src/tools/rustfmt/src/source_file.rs
index 6376bc49b69..2b43ec94b6b 100644
--- a/src/tools/rustfmt/src/source_file.rs
+++ b/src/tools/rustfmt/src/source_file.rs
@@ -66,7 +66,7 @@ where
         }
     }
 
-    #[cfg_attr(not(bootstrap), allow(non_local_definitions))]
+    #[allow(non_local_definitions)]
     impl From<&FileName> for rustc_span::FileName {
         fn from(filename: &FileName) -> rustc_span::FileName {
             match filename {
-- 
cgit 1.4.1-3-g733a5


From 9a22a0fdab7ca41d2aedcd2903743cd12438213b Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 19 Mar 2024 22:58:49 -0400
Subject: Fix bootstrap bump fallout

---
 src/bootstrap/src/core/builder/tests.rs      | 2 +-
 src/tools/jsondoclint/src/validator/tests.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/tools')

diff --git a/src/bootstrap/src/core/builder/tests.rs b/src/bootstrap/src/core/builder/tests.rs
index 7739303aca1..0f977640559 100644
--- a/src/bootstrap/src/core/builder/tests.rs
+++ b/src/bootstrap/src/core/builder/tests.rs
@@ -1,6 +1,6 @@
 use super::*;
 use crate::core::build_steps::doc::DocumentationFormat;
-use crate::core::config::{Config, DryRun, TargetSelection};
+use crate::core::config::Config;
 use std::thread;
 
 fn configure(cmd: &str, host: &[&str], target: &[&str]) -> Config {
diff --git a/src/tools/jsondoclint/src/validator/tests.rs b/src/tools/jsondoclint/src/validator/tests.rs
index 95a56a9dfac..ba0fe11ea26 100644
--- a/src/tools/jsondoclint/src/validator/tests.rs
+++ b/src/tools/jsondoclint/src/validator/tests.rs
@@ -1,5 +1,5 @@
 use rustc_hash::FxHashMap;
-use rustdoc_json_types::{Crate, Item, ItemKind, ItemSummary, Visibility, FORMAT_VERSION};
+use rustdoc_json_types::{Item, ItemKind, Visibility, FORMAT_VERSION};
 
 use crate::json_find::SelectorPart;
 
-- 
cgit 1.4.1-3-g733a5