Auto merge of #63207 - petrochenkov:outest2, r=Mark-Simulacrum

Unconfigure compiler unit test files during normal build

I haven't touched libstd though, it had a lot of tests and I'm not sure the people maintaining it want this.

Closes https://github.com/rust-lang/rust/issues/61097
r? @Mark-Simulacrum

1 files changed, 3 insertions, 2 deletions

diff --git a/src/bootstrap/cache.rs b/src/bootstrap/cache.rs
index f137a7b8cc2..53071df8552 100644
--- a/src/bootstrap/cache.rs
+++ b/src/bootstrap/cache.rs
@@ -266,8 +266,10 @@ impl Cache {
                         .expect("invalid type mapped");
         stepcache.get(step).cloned()
     }
+}
 
-    #[cfg(test)]
+#[cfg(test)]
+impl Cache {
     pub fn all<S: Ord + Copy + Step>(&mut self) -> Vec<(S, S::Output)> {
         let cache = self.0.get_mut();
         let type_id = TypeId::of::<S>();
@@ -279,7 +281,6 @@ impl Cache {
         v
     }
 
-    #[cfg(test)]
     pub fn contains<S: Step>(&self) -> bool {
         self.0.borrow().contains_key(&TypeId::of::<S>())
     }