This PR removes few modules from toml

- Removes common.rs, macros.rs, merge.rs, and parsing.rs
- All the content of common.rs, macros.rs and merge.rs are now moved to mod.rs
- The parse_inner is again back in config.rs

Author: Shourya742

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

@@ -1,6 +1,6 @@
 use std::fmt;
 
-use crate::core::config::toml::common::SplitDebuginfo;
+use crate::core::config::SplitDebuginfo;
 use crate::utils::cache::{INTERNER, Interned};
 use crate::{Path, env};
 

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

@@ -8,8 +8,8 @@
 
 use serde::{Deserialize, Deserializer};
 
-use crate::core::config::toml::common::StringOrBool;
-use crate::core::config::toml::{Merge, ReplaceOpt};
+use crate::core::config::toml::ReplaceOpt;
+use crate::core::config::{Merge, StringOrBool};
 use crate::{HashSet, PathBuf, define_config, exit};
 
 define_config! {

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

@@ -7,8 +7,8 @@
 
 use serde::{Deserialize, Deserializer};
 
-use crate::core::config::set;
-use crate::core::config::toml::{Merge, ReplaceOpt};
+use crate::core::config::toml::ReplaceOpt;
+use crate::core::config::{Merge, set};
 use crate::{Config, HashSet, PathBuf, define_config, exit};
 
 define_config! {

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

@@ -6,8 +6,8 @@
 
 use serde::{Deserialize, Deserializer};
 
-use crate::core::config::GccCiMode;
-use crate::core::config::toml::{Merge, ReplaceOpt};
+use crate::core::config::toml::ReplaceOpt;
+use crate::core::config::{GccCiMode, Merge};
 use crate::{Config, HashSet, PathBuf, define_config, exit};
 
 define_config! {

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

@@ -8,8 +8,8 @@
 
 use serde::{Deserialize, Deserializer};
 
-use crate::core::config::set;
-use crate::core::config::toml::{Merge, ReplaceOpt};
+use crate::core::config::toml::ReplaceOpt;
+use crate::core::config::{Merge, set};
 use crate::{Config, HashSet, PathBuf, define_config, exit};
 
 define_config! {

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

@@ -3,9 +3,8 @@
 
 use serde::{Deserialize, Deserializer};
 
-use crate::core::config::set;
-use crate::core::config::toml::common::StringOrBool;
 use crate::core::config::toml::{Merge, ReplaceOpt, TomlConfig};
+use crate::core::config::{StringOrBool, set};
 use crate::{Config, HashMap, HashSet, PathBuf, define_config, exit};
 
 define_config! {