Skip to content

Commit 3bccd4b

Browse files
committed
better formatparam order
1 parent 5ece0fe commit 3bccd4b

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

clippy_utils/src/macros.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -599,8 +599,8 @@ pub struct FormatParam<'tcx> {
599599

600600
impl<'tcx> FormatParam<'tcx> {
601601
fn new(
602-
usage: FormatParamUsage,
603602
mut kind: FormatParamKind,
603+
usage: FormatParamUsage,
604604
position: usize,
605605
inner: rpf::InnerSpan,
606606
values: &FormatArgsValues<'tcx>,
@@ -648,22 +648,22 @@ impl<'tcx> Count<'tcx> {
648648
Some(match count {
649649
rpf::Count::CountIs(val) => Self::Is(val, span_from_inner(values.format_string_span, inner?)),
650650
rpf::Count::CountIsName(name, _) => Self::Param(FormatParam::new(
651-
usage,
652651
FormatParamKind::Named(Symbol::intern(name)),
652+
usage,
653653
position?,
654654
inner?,
655655
values,
656656
)?),
657657
rpf::Count::CountIsParam(_) => Self::Param(FormatParam::new(
658-
usage,
659658
FormatParamKind::Numbered,
659+
usage,
660660
position?,
661661
inner?,
662662
values,
663663
)?),
664664
rpf::Count::CountIsStar(_) => Self::Param(FormatParam::new(
665-
usage,
666665
FormatParamKind::Starred,
666+
usage,
667667
position?,
668668
inner?,
669669
values,
@@ -837,13 +837,13 @@ impl<'tcx> FormatArgsExpn<'tcx> {
837837
.map(|(position, parsed_arg, arg_span)| {
838838
Some(FormatArg {
839839
param: FormatParam::new(
840-
FormatParamUsage::Argument,
841840
match parsed_arg.position {
842841
rpf::Position::ArgumentImplicitlyIs(_) => FormatParamKind::Implicit,
843842
rpf::Position::ArgumentIs(_) => FormatParamKind::Numbered,
844843
// NamedInline is handled by `FormatParam::new()`
845844
rpf::Position::ArgumentNamed(name) => FormatParamKind::Named(Symbol::intern(name)),
846845
},
846+
FormatParamUsage::Argument,
847847
position.value,
848848
parsed_arg.position_span,
849849
&values,

0 commit comments

Comments
 (0)