mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use CountIsStart in clippy

Browse Source
This commit is contained in:
Jason Newcomb 2022-08-31 09:33:32 -04:00
parent fb41bfa774
commit 7bd5b012c7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clippy_lints/src/write.rs
View File

@ -526,7 +526,7 @@ impl SimpleFormatArgs {
str_lit_span: Span, str_lit_span: Span,
fmt_span: Span, fmt_span: Span,
) { ) {
use rustc_parse_format::{ArgumentImplicitlyIs, ArgumentIs, CountIsParam}; use rustc_parse_format::{ArgumentImplicitlyIs, ArgumentIs, CountIsParam, CountIsStar};
let snippet = snippet_opt(cx, fmt_span); let snippet = snippet_opt(cx, fmt_span);
@ -540,7 +540,7 @@ impl SimpleFormatArgs {
self.push_to_complex(span, n); self.push_to_complex(span, n);
}; };
if let (CountIsParam(n), Some(span)) = (arg.format.precision, arg.format.precision_span) { if let (CountIsParam(n) | CountIsStar(n), Some(span)) = (arg.format.precision, arg.format.precision_span) {
// We need to do this hack as precision spans should be converted from .* to .foo$ // We need to do this hack as precision spans should be converted from .* to .foo$
let hack = if snippet.as_ref().and_then(|s| s.find('*')).is_some() { let hack = if snippet.as_ref().and_then(|s| s.find('*')).is_some() {
0 0

2
clippy_utils/src/macros.rs
View File

@ -644,7 +644,7 @@ impl<'tcx> Count<'tcx> {
span, span,
values, values,
)?), )?),
rpf::Count::CountIsParam(_) => { rpf::Count::CountIsParam(_) | rpf::Count::CountIsStar(_) => {
Self::Param(FormatParam::new(FormatParamKind::Numbered, position?, inner?, values)?) Self::Param(FormatParam::new(FormatParamKind::Numbered, position?, inner?, values)?)
}, },
rpf::Count::CountImplied => Self::Implied, rpf::Count::CountImplied => Self::Implied,