move config check logic from get_toml to parse_inner

Author: Shourya742

src/bootstrap/src/core/config/config.rs

@@ -401,6 +401,21 @@ impl Config {
             skip_std_check_if_no_download_rustc: flags_skip_std_check_if_no_download_rustc,
         } = flags;
 
+        #[cfg(test)]
+        {
+            let tmp = test_build_dir();
+            if let Some(config_path) = flags_config.as_ref() {
+                assert!(
+                    !config_path.starts_with(&tmp),
+                    "Path {:?} should not be inside or equal to temp dir {:?}",
+                    config_path,
+                    tmp
+                );
+            } else {
+                panic!("During test the config should be explicitly added");
+            }
+        }
+
         #[cfg(feature = "tracing")]
         span!(
             target: "CONFIG_HANDLING",

src/bootstrap/src/core/config/tests.rs

@@ -175,20 +175,14 @@ fn override_toml_duplicate() {
 
 #[test]
 fn profile_user_dist() {
-    fn get_toml(file: &Path) -> Result<TomlConfig, toml::de::Error> {
-        let contents = if file.ends_with("bootstrap.toml")
-            || file.ends_with("config.toml")
-            || env::var_os("RUST_BOOTSTRAP_CONFIG").is_some()
-        {
-            "profile = \"user\"".to_owned()
-        } else {
-            assert!(file.ends_with("config.dist.toml") || file.ends_with("bootstrap.dist.toml"));
-            std::fs::read_to_string(file).unwrap()
-        };
-
-        toml::from_str(&contents).and_then(|table: toml::Value| TomlConfig::deserialize(table))
-    }
-    Config::parse_inner(Flags::parse(&["check".to_owned()]), get_toml);
+    TestCtx::new()
+        .config("check")
+        .with_default_toml_config(
+            r#"
+        profile = "user"
+    "#,
+        )
+        .create_config();
 }
 
 #[test]
@@ -648,6 +642,7 @@ fn test_include_precedence_over_profile() {
         .config("check")
         .with_default_toml_config(
             r#"
+        profile = "dist"
         include = ["./extension.toml"]
     "#,
         )

src/bootstrap/src/core/config/toml/mod.rs

@@ -152,12 +152,6 @@ impl Config {
     }
 
     pub(crate) fn get_toml(file: &Path) -> Result<TomlConfig, toml::de::Error> {
-        #[cfg(test)]
-        {
-            let tmp = std::env::temp_dir();
-            assert!(file.starts_with(&tmp), "Expected path in temp dir {:?}, got {:?}", tmp, file);
-        }
-
         Self::get_toml_inner(file)
     }