[review] skip_macro_names -> skip_macro_invocations

Author: tommilligan

Configurations.md

@@ -1014,7 +1014,7 @@ macro_rules! foo {
 
 See also [`format_macro_matchers`](#format_macro_matchers).
 
-## `skip_macro_names`
+## `skip_macro_invocations`
 
 Skip formatting the bodies of macro invocations with the following names.
 

src/config/mod.rs

@@ -70,7 +70,7 @@ create_config! {
     format_macro_matchers: bool, false, false,
         "Format the metavariable matching patterns in macros";
     format_macro_bodies: bool, true, false, "Format the bodies of macros";
-    skip_macro_names: MacroSelectors, MacroSelectors::default(), false,
+    skip_macro_invocations: MacroSelectors, MacroSelectors::default(), false,
         "Skip formatting the bodies of macros invoked with the following names.";
     hex_literal_case: HexLiteralCase, HexLiteralCase::Preserve, false,
         "Format hexadecimal integer literals";
@@ -617,7 +617,7 @@ normalize_doc_attributes = false
 format_strings = false
 format_macro_matchers = false
 format_macro_bodies = true
-skip_macro_names = []
+skip_macro_invocations = []
 hex_literal_case = "Preserve"
 empty_item_single_line = true
 struct_lit_single_line = true
@@ -1028,11 +1028,11 @@ make_backup = false
     }
 
     #[test]
-    fn test_override_skip_macro_names() {
+    fn test_override_skip_macro_invocations() {
         let mut config = Config::default();
-        config.override_value("skip_macro_names", r#"["*", "println"]"#);
+        config.override_value("skip_macro_invocations", r#"["*", "println"]"#);
         assert_eq!(
-            config.skip_macro_names(),
+            config.skip_macro_invocations(),
             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().0 {
+        for macro_selector in config.skip_macro_invocations().0 {
             match macro_selector {
                 MacroSelector::Name(name) => macro_names.push(name.to_string()),
                 MacroSelector::All => skip_context.all_macros = true,

tests/source/skip_macro_names.rs

@@ -1,4 +1,4 @@
-// rustfmt-skip_macro_names: ["items"]
+// rustfmt-skip_macro_invocations: ["items"]
 
 macro_rules! items {
     ($($arg:item)*) => { $($arg)* };

tests/source/skip_macro_names_all.rs

@@ -1,4 +1,4 @@
-// rustfmt-skip_macro_names: ["*","items"]
+// rustfmt-skip_macro_invocations: ["*","items"]
 
 macro_rules! items {
     ($($arg:item)*) => { $($arg)* };

tests/target/skip_macro_names.rs

@@ -1,4 +1,4 @@
-// rustfmt-skip_macro_names: ["items"]
+// rustfmt-skip_macro_invocations: ["items"]
 
 macro_rules! items {
     ($($arg:item)*) => { $($arg)* };

tests/target/skip_macro_names_all.rs

@@ -1,4 +1,4 @@
-// rustfmt-skip_macro_names: ["*","items"]
+// rustfmt-skip_macro_invocations: ["*","items"]
 
 macro_rules! items {
     ($($arg:item)*) => { $($arg)* };