cleanup param expansion

Author: nyurik

clippy_lints/src/format_args.rs

@@ -182,18 +182,10 @@ fn check_inline(cx: &LateContext<'_>, param: &FormatParam<'_>, inline_spans: &mu
         && let Path { span, segments, .. } = path
         && let [segment] = segments
     {
-        // TODO: Note the inconsistency here, that we may want to address separately:
-        // implicit, numbered, and starred `param.span` spans the whole relevant string:
-        // the empty space between `{}`, or the entire value `1$`, `.2$`, or `.*`
-        // but the named argument spans just the name itself, without the surrounding `.` and `$`.
-        let replacement = if param.kind == Numbered || param.kind == Starred {
-            match param.usage {
-                FormatParamUsage::Argument => segment.ident.name.to_string(),
-                FormatParamUsage::Width => format!("{}$", segment.ident.name),
-                FormatParamUsage::Precision => format!(".{}$", segment.ident.name),
-            }
-        } else {
-            segment.ident.name.to_string()
+        let replacement = match param.usage {
+            FormatParamUsage::Argument => segment.ident.name.to_string(),
+            FormatParamUsage::Width => format!("{}$", segment.ident.name),
+            FormatParamUsage::Precision => format!(".{}$", segment.ident.name),
         };
         inline_spans.push((param.span, replacement));
         let arg_span = expand_past_previous_comma(cx, *span);

clippy_utils/src/macros.rs

@@ -643,11 +643,11 @@ impl<'tcx> Count<'tcx> {
     ) -> Option<Self> {
         Some(match count {
             rpf::Count::CountIs(val) => Self::Is(val, span_from_inner(values.format_string_span, inner?)),
-            rpf::Count::CountIsName(name, span) => Self::Param(FormatParam::new(
+            rpf::Count::CountIsName(name, _) => Self::Param(FormatParam::new(
                 usage,
                 FormatParamKind::Named(Symbol::intern(name)),
                 position?,
-                span,
+                inner?,
                 values,
             )?),
             rpf::Count::CountIsParam(_) => Self::Param(FormatParam::new(