rm indoc, ignore expanded macros

Author: nyurik

Cargo.toml

@@ -46,7 +46,6 @@ clap = { version = "3.1", features = ["derive"] }
 clippy_utils = { path = "clippy_utils" }
 derive-new = "0.5"
 if_chain = "1.0"
-indoc = "1.0"
 itertools = "0.10.1"
 quote = "1.0"
 serde = { version = "1.0.125", features = ["derive"] }

clippy_lints/src/format_args.rs

@@ -164,6 +164,10 @@ impl<'tcx> LateLintPass<'tcx> for FormatArgs {
 }
 
 fn check_uninlined_args(cx: &LateContext<'_>, args: &FormatArgsExpn<'_>, call_site: Span) {
+    if args.format_string.span.from_expansion() {
+        return;
+    }
+
     let mut fixes = Vec::new();
     // If any of the arguments are referenced by an index number,
     // and that argument is not a simple variable and cannot be inlined,
@@ -204,17 +208,17 @@ fn check_one_arg(cx: &LateContext<'_>, param: &FormatParam<'_>, fixes: &mut Vec<
         && let [segment] = segments
     {
         let replacement = match param.usage {
-        FormatParamUsage::Argument => segment.ident.name.to_string(),
+            FormatParamUsage::Argument => segment.ident.name.to_string(),
             FormatParamUsage::Width => format!("{}$", segment.ident.name),
             FormatParamUsage::Precision => format!(".{}$", segment.ident.name),
-    };
-    fixes.push((param.span, replacement));
-    let arg_span = expand_past_previous_comma(cx, *span);
-    fixes.push((arg_span, String::new()));
-    true  // successful inlining, continue checking
-} else {
-    // if we can't inline a numbered argument, we can't continue
-    param.kind != Numbered
+        };
+        fixes.push((param.span, replacement));
+        let arg_span = expand_past_previous_comma(cx, *span);
+        fixes.push((arg_span, String::new()));
+        true  // successful inlining, continue checking
+    } else {
+        // if we can't inline a numbered argument, we can't continue
+        param.kind != Numbered
     }
 }
 

tests/compile-test.rs

@@ -37,7 +37,6 @@ static TEST_DEPENDENCIES: &[&str] = &[
     "tokio",
     "parking_lot",
     "rustc_semver",
-    "indoc",
 ];
 
 // Test dependencies may need an `extern crate` here to ensure that they show up
@@ -53,8 +52,6 @@ extern crate futures;
 #[allow(unused_extern_crates)]
 extern crate if_chain;
 #[allow(unused_extern_crates)]
-extern crate indoc;
-#[allow(unused_extern_crates)]
 extern crate itertools;
 #[allow(unused_extern_crates)]
 extern crate parking_lot;

tests/ui/uninlined_format_args.fixed

@@ -8,8 +8,6 @@
 #![warn(clippy::uninlined_format_args)]
 #![feature(custom_inner_attributes)]
 
-use indoc::{indoc, printdoc};
-
 macro_rules! no_param_str {
     () => {
         "{}"
@@ -130,8 +128,9 @@ fn tester(fn_arg: i32) {
         "val='{local_i32
     }'"
     );
+    println!(no_param_str!(), local_i32);
+
     // FIXME: bugs!
-    // println!(no_param_str!(), local_i32);
     // println!(pass_through!("foo={local_i32}"), local_i32 = local_i32);
     // println!(pass_through!("foo={}"), local_i32);
     // println!(indoc!("foo={}"), local_i32);

tests/ui/uninlined_format_args.rs

@@ -8,8 +8,6 @@
 #![warn(clippy::uninlined_format_args)]
 #![feature(custom_inner_attributes)]
 
-use indoc::{indoc, printdoc};
-
 macro_rules! no_param_str {
     () => {
         "{}"
@@ -133,8 +131,9 @@ fn tester(fn_arg: i32) {
         "val='{local_i32
     }'"
     );
+    println!(no_param_str!(), local_i32);
+
     // FIXME: bugs!
-    // println!(no_param_str!(), local_i32);
     // println!(pass_through!("foo={local_i32}"), local_i32 = local_i32);
     // println!(pass_through!("foo={}"), local_i32);
     // println!(indoc!("foo={}"), local_i32);