From 4b3ef416bad9ad147f2f94dd5498853106a01d06 Mon Sep 17 00:00:00 2001
From: onur-ozkan <work@onurozkan.dev>
Date: Sun, 21 Jan 2024 10:47:12 +0300
Subject: [PATCH] bootstrap: update test modules

Signed-off-by: onur-ozkan <work@onurozkan.dev>
---
 src/bootstrap/src/core/build_steps/setup.rs               | 1 -
 .../{tests/setup.rs => core/build_steps/setup/tests.rs}   | 0
 src/bootstrap/src/core/builder.rs                         | 1 -
 .../src/{tests/builder.rs => core/builder/tests.rs}       | 0
 src/bootstrap/src/core/config/config.rs                   | 6 +-----
 src/bootstrap/src/core/config/mod.rs                      | 2 ++
 .../src/{tests/config.rs => core/config/tests.rs}         | 8 +++-----
 src/bootstrap/src/utils/change_tracker.rs                 | 1 -
 .../change_tracker.rs => utils/change_tracker/tests.rs}   | 0
 src/bootstrap/src/utils/helpers.rs                        | 1 -
 .../src/{tests/helpers.rs => utils/helpers/tests.rs}      | 0
 11 files changed, 6 insertions(+), 14 deletions(-)
 rename src/bootstrap/src/{tests/setup.rs => core/build_steps/setup/tests.rs} (100%)
 rename src/bootstrap/src/{tests/builder.rs => core/builder/tests.rs} (100%)
 rename src/bootstrap/src/{tests/config.rs => core/config/tests.rs} (97%)
 rename src/bootstrap/src/{tests/change_tracker.rs => utils/change_tracker/tests.rs} (100%)
 rename src/bootstrap/src/{tests/helpers.rs => utils/helpers/tests.rs} (100%)

diff --git a/src/bootstrap/src/core/build_steps/setup.rs b/src/bootstrap/src/core/build_steps/setup.rs
index 9c897ae1bb784..8e3c9e2be8b85 100644
--- a/src/bootstrap/src/core/build_steps/setup.rs
+++ b/src/bootstrap/src/core/build_steps/setup.rs
@@ -14,7 +14,6 @@ use std::str::FromStr;
 use std::{fmt, fs, io};
 
 #[cfg(test)]
-#[path = "../../tests/setup.rs"]
 mod tests;
 
 #[derive(Clone, Copy, Debug, Eq, PartialEq, Hash)]
diff --git a/src/bootstrap/src/tests/setup.rs b/src/bootstrap/src/core/build_steps/setup/tests.rs
similarity index 100%
rename from src/bootstrap/src/tests/setup.rs
rename to src/bootstrap/src/core/build_steps/setup/tests.rs
diff --git a/src/bootstrap/src/core/builder.rs b/src/bootstrap/src/core/builder.rs
index 4e20babc55a68..a6b51f6ec63cf 100644
--- a/src/bootstrap/src/core/builder.rs
+++ b/src/bootstrap/src/core/builder.rs
@@ -32,7 +32,6 @@ use clap::ValueEnum;
 use once_cell::sync::Lazy;
 
 #[cfg(test)]
-#[path = "../tests/builder.rs"]
 mod tests;
 
 pub struct Builder<'a> {
diff --git a/src/bootstrap/src/tests/builder.rs b/src/bootstrap/src/core/builder/tests.rs
similarity index 100%
rename from src/bootstrap/src/tests/builder.rs
rename to src/bootstrap/src/core/builder/tests.rs
diff --git a/src/bootstrap/src/core/config/config.rs b/src/bootstrap/src/core/config/config.rs
index fcdd742e69c22..c0dd1e1208484 100644
--- a/src/bootstrap/src/core/config/config.rs
+++ b/src/bootstrap/src/core/config/config.rs
@@ -3,10 +3,6 @@
 //! This module implements parsing `config.toml` configuration files to tweak
 //! how the build runs.
 
-#[cfg(test)]
-#[path = "../../tests/config.rs"]
-mod tests;
-
 use std::cell::{Cell, RefCell};
 use std::cmp;
 use std::collections::{HashMap, HashSet};
@@ -1203,7 +1199,7 @@ impl Config {
         Self::parse_inner(args, get_toml)
     }
 
-    fn parse_inner(args: &[String], get_toml: impl Fn(&Path) -> TomlConfig) -> Config {
+    pub(crate) fn parse_inner(args: &[String], get_toml: impl Fn(&Path) -> TomlConfig) -> Config {
         let mut flags = Flags::parse(&args);
         let mut config = Config::default_opts();
 
diff --git a/src/bootstrap/src/core/config/mod.rs b/src/bootstrap/src/core/config/mod.rs
index 9c6861826d605..99412848abbb7 100644
--- a/src/bootstrap/src/core/config/mod.rs
+++ b/src/bootstrap/src/core/config/mod.rs
@@ -1,4 +1,6 @@
 pub(crate) mod config;
 pub(crate) mod flags;
+#[cfg(test)]
+mod tests;
 
 pub use config::*;
diff --git a/src/bootstrap/src/tests/config.rs b/src/bootstrap/src/core/config/tests.rs
similarity index 97%
rename from src/bootstrap/src/tests/config.rs
rename to src/bootstrap/src/core/config/tests.rs
index c65067f8e8f76..a71356f9e23ce 100644
--- a/src/bootstrap/src/tests/config.rs
+++ b/src/bootstrap/src/core/config/tests.rs
@@ -1,4 +1,4 @@
-use super::{Config, Flags};
+use super::{flags::Flags, Config};
 use crate::core::config::{LldMode, TomlConfig};
 
 use clap::CommandFactory;
@@ -213,10 +213,8 @@ fn verify_file_integrity() {
     File::create(&tempfile).unwrap().write_all(b"dummy value").unwrap();
     assert!(tempfile.exists());
 
-    assert!(
-        config
-            .verify(&tempfile, "7e255dd9542648a8779268a0f268b891a198e9828e860ed23f826440e786eae5")
-    );
+    assert!(config
+        .verify(&tempfile, "7e255dd9542648a8779268a0f268b891a198e9828e860ed23f826440e786eae5"));
 
     remove_file(tempfile).unwrap();
 }
diff --git a/src/bootstrap/src/utils/change_tracker.rs b/src/bootstrap/src/utils/change_tracker.rs
index 26d36ab52aba2..0d5e2600b73a9 100644
--- a/src/bootstrap/src/utils/change_tracker.rs
+++ b/src/bootstrap/src/utils/change_tracker.rs
@@ -3,7 +3,6 @@
 //! the bootstrap.
 
 #[cfg(test)]
-#[path = "../tests/change_tracker.rs"]
 mod tests;
 
 #[derive(Clone, Debug)]
diff --git a/src/bootstrap/src/tests/change_tracker.rs b/src/bootstrap/src/utils/change_tracker/tests.rs
similarity index 100%
rename from src/bootstrap/src/tests/change_tracker.rs
rename to src/bootstrap/src/utils/change_tracker/tests.rs
diff --git a/src/bootstrap/src/utils/helpers.rs b/src/bootstrap/src/utils/helpers.rs
index 0c917c3d57933..d1f713af91709 100644
--- a/src/bootstrap/src/utils/helpers.rs
+++ b/src/bootstrap/src/utils/helpers.rs
@@ -21,7 +21,6 @@ use crate::LldMode;
 pub use crate::utils::dylib::{dylib_path, dylib_path_var};
 
 #[cfg(test)]
-#[path = "../tests/helpers.rs"]
 mod tests;
 
 /// A helper macro to `unwrap` a result except also print out details like:
diff --git a/src/bootstrap/src/tests/helpers.rs b/src/bootstrap/src/utils/helpers/tests.rs
similarity index 100%
rename from src/bootstrap/src/tests/helpers.rs
rename to src/bootstrap/src/utils/helpers/tests.rs