[review] test override skip macro names

Author: tommilligan

src/config/macro_names.rs

@@ -11,6 +11,12 @@ use thiserror::Error;
 #[derive(Clone, Debug, Eq, PartialEq, Hash, Ord, PartialOrd, Deserialize, Serialize)]
 pub struct MacroName(String);
 
+impl MacroName {
+    pub fn new(other: String) -> Self {
+        Self(other)
+    }
+}
+
 impl fmt::Display for MacroName {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         self.0.fmt(f)
@@ -52,13 +58,7 @@ impl str::FromStr for MacroSelector {
 
 /// A set of macro selectors.
 #[derive(Clone, Debug, Default, PartialEq, Deserialize, Serialize)]
-pub struct MacroSelectors(Vec<MacroSelector>);
-
-impl MacroSelectors {
-    pub fn into_inner(self) -> Vec<MacroSelector> {
-        self.0
-    }
-}
+pub struct MacroSelectors(pub Vec<MacroSelector>);
 
 impl fmt::Display for MacroSelectors {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

src/config/mod.rs

@@ -408,6 +408,7 @@ mod test {
     use super::*;
     use std::str;
 
+    use crate::config::macro_names::MacroName;
     use rustfmt_config_proc_macro::{nightly_only_test, stable_only_test};
 
     #[allow(dead_code)]
@@ -927,4 +928,17 @@ make_backup = false
             assert_eq!(config.single_line_if_else_max_width(), 100);
         }
     }
+
+    #[test]
+    fn test_override_skip_macro_names() {
+        let mut config = Config::default();
+        config.override_value("skip_macro_names", r#"["*", "println"]"#);
+        assert_eq!(
+            config.skip_macro_names(),
+            MacroSelectors(vec![
+                MacroSelector::All,
+                MacroSelector::Name(MacroName::new("println".to_owned()))
+            ])
+        );
+    }
 }

src/visitor.rs

@@ -772,7 +772,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
     ) -> FmtVisitor<'a> {
         let mut skip_context = SkipContext::default();
         let mut macro_names = Vec::new();
-        for macro_selector in config.skip_macro_names().into_inner() {
+        for macro_selector in config.skip_macro_names().0 {
             match macro_selector {
                 MacroSelector::Name(name) => macro_names.push(name.to_string()),
                 MacroSelector::All => skip_context.all_macros = true,