fixup! Merge configs from parent directories

Author: ayazhafiz

rustfmt-core/rustfmt-lib/src/config.rs

@@ -293,9 +293,7 @@ impl Config {
             Ok(None)
         }
 
-        let files = resolve_project_files(dir);
-
-        match files? {
+        match resolve_project_files(dir)? {
             None => Ok((Config::default(), None)),
             Some(paths) => {
                 let mut config = Config::default();

rustfmt-core/rustfmt-lib/src/config/config_type.rs

@@ -50,19 +50,19 @@ impl ConfigType for IgnoreList {
     }
 }
 
-macro_rules! update {
-    ($self:ident, ignore = $val:ident, $dir:ident) => {
-        $self.ignore.1 = true;
+macro_rules! update_config {
+    ($config:ident, ignore = $val:ident, $dir:ident) => {
+        $config.ignore.1 = true;
 
         let mut new_ignored = $val;
         new_ignored.add_prefix($dir);
-        let old_ignored = $self.ignore.2;
-        $self.ignore.2 = old_ignored.merge_into(new_ignored);
+        let old_ignored = $config.ignore.2;
+        $config.ignore.2 = old_ignored.merge_into(new_ignored);
     };
 
-    ($self:ident, $i:ident = $val:ident, $dir:ident) => {
-        $self.$i.1 = true;
-        $self.$i.2 = $val;
+    ($config:ident, $i:ident = $val:ident, $dir:ident) => {
+        $config.$i.1 = true;
+        $config.$i.2 = $val;
     };
 }
 
@@ -165,10 +165,10 @@ macro_rules! create_config {
             $(
                 if let Some(val) = parsed.$i {
                     if self.$i.3 {
-                        update!(self, $i = val, dir);
+                        update_config!(self, $i = val, dir);
                     } else {
                         if is_nightly_channel!() {
-                            update!(self, $i = val, dir);
+                            update_config!(self, $i = val, dir);
                         } else {
                             eprintln!("Warning: can't set `{} = {:?}`, unstable features are only \
                                        available in nightly channel.", stringify!($i), val);

rustfmt-core/rustfmt-lib/src/config/options.rs

@@ -277,14 +277,18 @@ impl IgnoreList {
         &self.rustfmt_toml_path
     }
 
+    /// Merges `self` into `other`, returning a new `IgnoreList`. The resulting `IgnoreList` uses
+    /// the `rustfmt_toml_path` of `other`, and only contains paths that are in `other`'s
+    /// `rustfmt_toml_path`.
     pub fn merge_into(self, other: Self) -> Self {
         let old_rustfmt_toml_path = self.rustfmt_toml_path;
-        let new_rustfmt_toml_path = other.rustfmt_toml_path.clone();
+        let new_rustfmt_toml_path = other.rustfmt_toml_path;
         let relocalized_old_paths: HashSet<PathBuf> = self
             .path_set
             .into_iter()
             .map(|p| old_rustfmt_toml_path.parent().unwrap().join(p))
             .map(|p| {
+                // Only keep old paths that are also in the new config path
                 p.strip_prefix(new_rustfmt_toml_path.parent().unwrap())
                     .map(PathBuf::from)
             })