From 8eb1b8cf357c7130fc95f24f84cf0d4c0d2eb8fa Mon Sep 17 00:00:00 2001 From: nixx quality Date: Sun, 5 Dec 2021 21:50:05 +0100 Subject: [PATCH] fix errors reported by CI and hope these are enough --- clippy_lints/src/map_unit_fn.rs | 2 +- clippy_lints/src/nonstandard_macro_braces.rs | 2 +- clippy_lints/src/self_named_constructors.rs | 2 +- clippy_lints/src/unicode.rs | 6 +++--- clippy_lints/src/write.rs | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/clippy_lints/src/map_unit_fn.rs b/clippy_lints/src/map_unit_fn.rs index a84de3e079b3..58c686d95b3f 100644 --- a/clippy_lints/src/map_unit_fn.rs +++ b/clippy_lints/src/map_unit_fn.rs @@ -190,7 +190,7 @@ fn unit_closure<'tcx>( /// Anything else will return `a`. fn let_binding_name(cx: &LateContext<'_>, var_arg: &hir::Expr<'_>) -> String { match &var_arg.kind { - hir::ExprKind::Field(_, _) => snippet(cx, var_arg.span, "_").replace(".", "_"), + hir::ExprKind::Field(_, _) => snippet(cx, var_arg.span, "_").replace('.', "_"), hir::ExprKind::Path(_) => format!("_{}", snippet(cx, var_arg.span, "")), _ => "a".to_string(), } diff --git a/clippy_lints/src/nonstandard_macro_braces.rs b/clippy_lints/src/nonstandard_macro_braces.rs index 3dcc9e26c9e2..a04d589f880f 100644 --- a/clippy_lints/src/nonstandard_macro_braces.rs +++ b/clippy_lints/src/nonstandard_macro_braces.rs @@ -112,7 +112,7 @@ fn is_offending_macro<'a>(cx: &EarlyContext<'_>, span: Span, mac_braces: &'a Mac if snip.starts_with(&format!("{}!", name)); if unnested_or_local(); // make formatting consistent - let c = snip.replace(" ", ""); + let c = snip.replace(' ', ""); if !c.starts_with(&format!("{}!{}", name, braces.0)); if !mac_braces.done.contains(&span.ctxt().outer_expn_data().call_site); then { diff --git a/clippy_lints/src/self_named_constructors.rs b/clippy_lints/src/self_named_constructors.rs index 96c525ba649e..d386663e4985 100644 --- a/clippy_lints/src/self_named_constructors.rs +++ b/clippy_lints/src/self_named_constructors.rs @@ -76,7 +76,7 @@ impl<'tcx> LateLintPass<'tcx> for SelfNamedConstructors { let self_id = cx.tcx.hir().local_def_id_to_hir_id(self_local_did); if let Some(Node::Item(x)) = cx.tcx.hir().find(self_id); let type_name = x.ident.name.as_str().to_lowercase(); - if impl_item.ident.name.as_str() == type_name || impl_item.ident.name.as_str().replace("_", "") == type_name; + if impl_item.ident.name.as_str() == type_name || impl_item.ident.name.as_str().replace('_', "") == type_name; then { span_lint( diff --git a/clippy_lints/src/unicode.rs b/clippy_lints/src/unicode.rs index fbc4732e0ce3..afd7be89a4e2 100644 --- a/clippy_lints/src/unicode.rs +++ b/clippy_lints/src/unicode.rs @@ -106,9 +106,9 @@ fn check_str(cx: &LateContext<'_>, span: Span, id: HirId) { "invisible character detected", "consider replacing the string with", string - .replace("\u{200B}", "\\u{200B}") - .replace("\u{ad}", "\\u{AD}") - .replace("\u{2060}", "\\u{2060}"), + .replace('\u{200B}', "\\u{200B}") + .replace('\u{ad}', "\\u{AD}") + .replace('\u{2060}', "\\u{2060}"), Applicability::MachineApplicable, ); } diff --git a/clippy_lints/src/write.rs b/clippy_lints/src/write.rs index c90fca24ad48..5bf0cffdbad1 100644 --- a/clippy_lints/src/write.rs +++ b/clippy_lints/src/write.rs @@ -583,10 +583,10 @@ impl Write { let replacement: String = match lit.token.kind { LitKind::Integer | LitKind::Float | LitKind::Err => continue, LitKind::StrRaw(_) | LitKind::ByteStrRaw(_) if matches!(fmtstr.style, StrStyle::Raw(_)) => { - lit.token.symbol.as_str().replace("{", "{{").replace("}", "}}") + lit.token.symbol.as_str().replace('{', "{{").replace('}', "}}") }, LitKind::Str | LitKind::ByteStr if matches!(fmtstr.style, StrStyle::Cooked) => { - lit.token.symbol.as_str().replace("{", "{{").replace("}", "}}") + lit.token.symbol.as_str().replace('{', "{{").replace('}', "}}") }, LitKind::StrRaw(_) | LitKind::Str | LitKind::ByteStrRaw(_) | LitKind::ByteStr => continue, LitKind::Byte | LitKind::Char => match &*lit.token.symbol.as_str() {