From e2a511fe2059f7e64137aa893550b37195e96209 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Thu, 10 Sep 2020 13:16:35 +0200
Subject: [PATCH 1/3] use String::from instead of format!() macro to craft
string clippy::useless_format
---
compiler/rustc_mir/src/transform/instrument_coverage.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/rustc_mir/src/transform/instrument_coverage.rs b/compiler/rustc_mir/src/transform/instrument_coverage.rs
index 8f43df8a6cbd1..a5b30a25a9bdf 100644
--- a/compiler/rustc_mir/src/transform/instrument_coverage.rs
+++ b/compiler/rustc_mir/src/transform/instrument_coverage.rs
@@ -353,7 +353,7 @@ impl<'a, 'tcx> Instrumentor<'a, 'tcx> {
if !INCLUDE_COVERAGE_STATEMENTS {
continue;
}
- format!("unreachable")
+ String::from("unreachable")
}
},
_ => format!("{:?}", statement),
From e11c667e4af17ddebc47df803d6ea641cef7359b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Thu, 10 Sep 2020 13:20:33 +0200
Subject: [PATCH 2/3] don't clone types that are copy (clippy::clone_on_copy)
---
compiler/rustc_infer/src/infer/lub.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/compiler/rustc_infer/src/infer/lub.rs b/compiler/rustc_infer/src/infer/lub.rs
index 3e2ea3d0f8fbf..9f43fac0916b5 100644
--- a/compiler/rustc_infer/src/infer/lub.rs
+++ b/compiler/rustc_infer/src/infer/lub.rs
@@ -50,7 +50,7 @@ impl TypeRelation<'tcx> for Lub<'combine, 'infcx, 'tcx> {
ty::Invariant => self.fields.equate(self.a_is_expected).relate(a, b),
ty::Covariant => self.relate(a, b),
// FIXME(#41044) -- not correct, need test
- ty::Bivariant => Ok(a.clone()),
+ ty::Bivariant => Ok(a),
ty::Contravariant => self.fields.glb(self.a_is_expected).relate(a, b),
}
}
From 9bb10cc90741fada64ec633122835cb821d0c89c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Thu, 10 Sep 2020 13:57:40 +0200
Subject: [PATCH 3/3] use push(char) instead of push_str(&str) to add single
chars to strings
clippy::single-char-push-str
---
.../src/format_foreign.rs | 12 +++++-----
compiler/rustc_codegen_ssa/src/back/link.rs | 2 +-
.../src/debuginfo/type_names.rs | 2 +-
.../src/infer/error_reporting/mod.rs | 2 +-
.../src/borrow_check/diagnostics/mod.rs | 22 ++++++++++---------
.../src/borrow_check/region_infer/values.rs | 4 ++--
.../src/monomorphize/partitioning/mod.rs | 6 ++---
compiler/rustc_mir/src/util/pretty.rs | 2 +-
compiler/rustc_save_analysis/src/lib.rs | 2 +-
compiler/rustc_save_analysis/src/sig.rs | 2 +-
compiler/rustc_session/src/config.rs | 4 ++--
11 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/compiler/rustc_builtin_macros/src/format_foreign.rs b/compiler/rustc_builtin_macros/src/format_foreign.rs
index 85cf4c42e9435..b39423b86e7b5 100644
--- a/compiler/rustc_builtin_macros/src/format_foreign.rs
+++ b/compiler/rustc_builtin_macros/src/format_foreign.rs
@@ -166,14 +166,14 @@ pub mod printf {
let cap = self.span.len() + if has_options { 2 } else { 0 };
let mut s = String::with_capacity(cap);
- s.push_str("{");
+ s.push('{');
if let Some(arg) = self.parameter {
write!(s, "{}", arg.checked_sub(1)?).ok()?;
}
if has_options {
- s.push_str(":");
+ s.push(':');
let align = if let Some(fill) = fill {
s.push_str(fill);
@@ -191,11 +191,11 @@ pub mod printf {
}
if alt {
- s.push_str("#");
+ s.push('#');
}
if zero_fill {
- s.push_str("0");
+ s.push('0');
}
if let Some(width) = width {
@@ -203,7 +203,7 @@ pub mod printf {
}
if let Some(precision) = precision {
- s.push_str(".");
+ s.push('.');
precision.translate(&mut s).ok()?;
}
@@ -212,7 +212,7 @@ pub mod printf {
}
}
- s.push_str("}");
+ s.push('}');
Some(s)
}
}
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs
index c044020d9301b..faeb727202cd6 100644
--- a/compiler/rustc_codegen_ssa/src/back/link.rs
+++ b/compiler/rustc_codegen_ssa/src/back/link.rs
@@ -1076,7 +1076,7 @@ fn exec_linker(
}
.to_string(),
);
- args.push_str("\n");
+ args.push('\n');
}
let file = tmpdir.join("linker-arguments");
let bytes = if sess.target.target.options.is_like_msvc {
diff --git a/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
index 54e5d4d00f6e4..0c0f1bc681cf8 100644
--- a/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
+++ b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs
@@ -37,7 +37,7 @@ pub fn push_debuginfo_type_name<'tcx>(
ty::Bool => output.push_str("bool"),
ty::Char => output.push_str("char"),
ty::Str => output.push_str("str"),
- ty::Never => output.push_str("!"),
+ ty::Never => output.push('!'),
ty::Int(int_ty) => output.push_str(int_ty.name_str()),
ty::Uint(uint_ty) => output.push_str(uint_ty.name_str()),
ty::Float(float_ty) => output.push_str(float_ty.name_str()),
diff --git a/compiler/rustc_infer/src/infer/error_reporting/mod.rs b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
index b53605b0796c9..1225776db4590 100644
--- a/compiler/rustc_infer/src/infer/error_reporting/mod.rs
+++ b/compiler/rustc_infer/src/infer/error_reporting/mod.rs
@@ -2093,7 +2093,7 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
_ => String::new(),
};
if !s.is_empty() {
- s.push_str(" ");
+ s.push(' ');
}
s
};
diff --git a/compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs b/compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs
index f51bf7730ea09..3cee32834beb7 100644
--- a/compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs
+++ b/compiler/rustc_mir/src/borrow_check/diagnostics/mod.rs
@@ -150,8 +150,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
Some(mut descr) => {
// Surround descr with `backticks`.
descr.reserve(2);
- descr.insert_str(0, "`");
- descr.push_str("`");
+ descr.insert(0, '`');
+ descr.push('`');
descr
}
None => "value".to_string(),
@@ -222,7 +222,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
if self.upvars[var_index].by_ref {
buf.push_str(&name);
} else {
- buf.push_str(&format!("*{}", &name));
+ buf.push('*');
+ buf.push_str(&name);
}
} else {
if autoderef {
@@ -234,7 +235,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
&including_downcast,
)?;
} else {
- buf.push_str(&"*");
+ buf.push('*');
self.append_place_to_string(
PlaceRef { local, projection: proj_base },
buf,
@@ -272,7 +273,8 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
autoderef,
&including_downcast,
)?;
- buf.push_str(&format!(".{}", field_name));
+ buf.push('.');
+ buf.push_str(&field_name);
}
}
ProjectionElem::Index(index) => {
@@ -284,11 +286,11 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
autoderef,
&including_downcast,
)?;
- buf.push_str("[");
+ buf.push('[');
if self.append_local_to_string(*index, buf).is_err() {
- buf.push_str("_");
+ buf.push('_');
}
- buf.push_str("]");
+ buf.push(']');
}
ProjectionElem::ConstantIndex { .. } | ProjectionElem::Subslice { .. } => {
autoderef = true;
@@ -301,7 +303,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
autoderef,
&including_downcast,
)?;
- buf.push_str(&"[..]");
+ buf.push_str("[..]");
}
};
}
@@ -648,7 +650,7 @@ impl UseSpans {
" in closure".to_string()
}
}
- _ => "".to_string(),
+ _ => String::new(),
}
}
diff --git a/compiler/rustc_mir/src/borrow_check/region_infer/values.rs b/compiler/rustc_mir/src/borrow_check/region_infer/values.rs
index 8a5a600cfdd8a..f247d07e1f05e 100644
--- a/compiler/rustc_mir/src/borrow_check/region_infer/values.rs
+++ b/compiler/rustc_mir/src/borrow_check/region_infer/values.rs
@@ -417,7 +417,7 @@ crate fn location_set_str(
fn region_value_str(elements: impl IntoIterator<Item = RegionElement>) -> String {
let mut result = String::new();
- result.push_str("{");
+ result.push('{');
// Set to Some(l1, l2) when we have observed all the locations
// from l1..=l2 (inclusive) but not yet printed them. This
@@ -478,7 +478,7 @@ fn region_value_str(elements: impl IntoIterator<Item = RegionElement>) -> String
push_location_range(&mut result, location1, location2);
}
- result.push_str("}");
+ result.push('}');
return result;
diff --git a/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs b/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs
index e96af77bbb8e0..0f6f078d9686f 100644
--- a/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs
+++ b/compiler/rustc_mir/src/monomorphize/partitioning/mod.rs
@@ -382,7 +382,7 @@ fn collect_and_partition_mono_items<'tcx>(
cgus.sort_by_key(|(name, _)| *name);
cgus.dedup();
for &(ref cgu_name, (linkage, _)) in cgus.iter() {
- output.push_str(" ");
+ output.push(' ');
output.push_str(&cgu_name.as_str());
let linkage_abbrev = match linkage {
@@ -399,9 +399,9 @@ fn collect_and_partition_mono_items<'tcx>(
Linkage::Common => "Common",
};
- output.push_str("[");
+ output.push('[');
output.push_str(linkage_abbrev);
- output.push_str("]");
+ output.push(']');
}
output
})
diff --git a/compiler/rustc_mir/src/util/pretty.rs b/compiler/rustc_mir/src/util/pretty.rs
index 54bc248bc5b4a..75567181b6916 100644
--- a/compiler/rustc_mir/src/util/pretty.rs
+++ b/compiler/rustc_mir/src/util/pretty.rs
@@ -514,7 +514,7 @@ fn write_scope_tree(
write!(indented_decl, " as {:?}", user_ty).unwrap();
}
}
- indented_decl.push_str(";");
+ indented_decl.push(';');
let local_name =
if local == RETURN_PLACE { " return place".to_string() } else { String::new() };
diff --git a/compiler/rustc_save_analysis/src/lib.rs b/compiler/rustc_save_analysis/src/lib.rs
index c95e7e193be30..032d7cb3ed6b7 100644
--- a/compiler/rustc_save_analysis/src/lib.rs
+++ b/compiler/rustc_save_analysis/src/lib.rs
@@ -438,7 +438,7 @@ impl<'tcx> SaveContext<'tcx> {
.next()
.map(|item| item.def_id);
}
- qualname.push_str(">");
+ qualname.push('>');
(qualname, trait_id, decl_id, docs, attrs)
}
diff --git a/compiler/rustc_save_analysis/src/sig.rs b/compiler/rustc_save_analysis/src/sig.rs
index 6dd7f89d59486..747e198cd9324 100644
--- a/compiler/rustc_save_analysis/src/sig.rs
+++ b/compiler/rustc_save_analysis/src/sig.rs
@@ -497,7 +497,7 @@ impl<'hir> Sig for hir::Item<'hir> {
sig.text.push_str(&bounds_to_string(bounds));
}
// FIXME where clause
- sig.text.push_str(";");
+ sig.text.push(';');
Ok(sig)
}
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index 19cd238599210..4aecb35294a07 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -581,9 +581,9 @@ impl OutputFilenames {
if !ext.is_empty() {
if !extension.is_empty() {
- extension.push_str(".");
+ extension.push('.');
extension.push_str(RUST_CGU_EXT);
- extension.push_str(".");
+ extension.push('.');
}
extension.push_str(ext);