1
Fork 0

fix a couple of clippy warnings:

filter_next
manual_strip
redundant_static_lifetimes
single_char_pattern
unnecessary_cast
unused_unit
op_ref
redundant_closure
useless_conversion
This commit is contained in:
Matthias Krüger 2020-11-04 13:48:50 +01:00
parent 56293097f7
commit bcd2f2df67
11 changed files with 14 additions and 21 deletions

View file

@ -360,7 +360,7 @@ pub fn list_contains_name(items: &[NestedMetaItem], name: Symbol) -> bool {
impl MetaItem { impl MetaItem {
fn token_trees_and_spacings(&self) -> Vec<TreeAndSpacing> { fn token_trees_and_spacings(&self) -> Vec<TreeAndSpacing> {
let mut idents = vec![]; let mut idents = vec![];
let mut last_pos = BytePos(0 as u32); let mut last_pos = BytePos(0_u32);
for (i, segment) in self.path.segments.iter().enumerate() { for (i, segment) in self.path.segments.iter().enumerate() {
let is_first = i == 0; let is_first = i == 0;
if !is_first { if !is_first {

View file

@ -739,7 +739,6 @@ impl<'a, 'tcx> InferCtxt<'a, 'tcx> {
"cannot infer {} {} {} `{}`{}", "cannot infer {} {} {} `{}`{}",
kind_str, preposition, descr, type_name, parent_desc kind_str, preposition, descr, type_name, parent_desc
) )
.into()
} }
} }
} }

View file

@ -246,10 +246,10 @@ pub fn get_codegen_backend(sopts: &config::Options) -> Box<dyn CodegenBackend> {
INIT.call_once(|| { INIT.call_once(|| {
#[cfg(feature = "llvm")] #[cfg(feature = "llvm")]
const DEFAULT_CODEGEN_BACKEND: &'static str = "llvm"; const DEFAULT_CODEGEN_BACKEND: &str = "llvm";
#[cfg(not(feature = "llvm"))] #[cfg(not(feature = "llvm"))]
const DEFAULT_CODEGEN_BACKEND: &'static str = "cranelift"; const DEFAULT_CODEGEN_BACKEND: &str = "cranelift";
let codegen_name = sopts let codegen_name = sopts
.debugging_opts .debugging_opts
@ -414,11 +414,10 @@ pub fn get_codegen_sysroot(backend_name: &str) -> fn() -> Box<dyn CodegenBackend
let libdir = filesearch::relative_target_lib_path(&sysroot, &target); let libdir = filesearch::relative_target_lib_path(&sysroot, &target);
sysroot.join(libdir).with_file_name("codegen-backends") sysroot.join(libdir).with_file_name("codegen-backends")
}) })
.filter(|f| { .find(|f| {
info!("codegen backend candidate: {}", f.display()); info!("codegen backend candidate: {}", f.display());
f.exists() f.exists()
}) });
.next();
let sysroot = sysroot.unwrap_or_else(|| { let sysroot = sysroot.unwrap_or_else(|| {
let candidates = sysroot_candidates let candidates = sysroot_candidates
.iter() .iter()

View file

@ -399,7 +399,7 @@ impl<'tcx> TyCtxt<'tcx> {
def_id: DefId, def_id: DefId,
id: Option<HirId>, id: Option<HirId>,
span: Span, span: Span,
unmarked: impl FnOnce(Span, DefId) -> (), unmarked: impl FnOnce(Span, DefId),
) { ) {
let soft_handler = |lint, span, msg: &_| { let soft_handler = |lint, span, msg: &_| {
self.struct_span_lint_hir(lint, id.unwrap_or(hir::CRATE_HIR_ID), span, |lint| { self.struct_span_lint_hir(lint, id.unwrap_or(hir::CRATE_HIR_ID), span, |lint| {

View file

@ -46,7 +46,7 @@ impl SwitchTargets {
pub fn new(targets: impl Iterator<Item = (u128, BasicBlock)>, otherwise: BasicBlock) -> Self { pub fn new(targets: impl Iterator<Item = (u128, BasicBlock)>, otherwise: BasicBlock) -> Self {
let (values, mut targets): (SmallVec<_>, SmallVec<_>) = targets.unzip(); let (values, mut targets): (SmallVec<_>, SmallVec<_>) = targets.unzip();
targets.push(otherwise); targets.push(otherwise);
Self { values: values.into(), targets } Self { values, targets }
} }
/// Builds a switch targets definition that jumps to `then` if the tested value equals `value`, /// Builds a switch targets definition that jumps to `then` if the tested value equals `value`,

View file

@ -120,7 +120,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
let move_out = self.move_data.moves[(*move_site).moi]; let move_out = self.move_data.moves[(*move_site).moi];
let moved_place = &self.move_data.move_paths[move_out.path].place; let moved_place = &self.move_data.move_paths[move_out.path].place;
// `*(_1)` where `_1` is a `Box` is actually a move out. // `*(_1)` where `_1` is a `Box` is actually a move out.
let is_box_move = moved_place.as_ref().projection == &[ProjectionElem::Deref] let is_box_move = moved_place.as_ref().projection == [ProjectionElem::Deref]
&& self.body.local_decls[moved_place.local].ty.is_box(); && self.body.local_decls[moved_place.local].ty.is_box();
!is_box_move !is_box_move

View file

@ -63,7 +63,7 @@ impl<'tcx> MirPass<'tcx> for MatchBranchSimplification {
}; };
// Check that destinations are identical, and if not, then don't optimize this block // Check that destinations are identical, and if not, then don't optimize this block
if &bbs[first].terminator().kind != &bbs[second].terminator().kind { if bbs[first].terminator().kind != bbs[second].terminator().kind {
continue; continue;
} }

View file

@ -1886,9 +1886,8 @@ impl<'tcx> LifetimeContext<'_, 'tcx> {
if snippet.starts_with('&') && !snippet.starts_with("&'") { if snippet.starts_with('&') && !snippet.starts_with("&'") {
introduce_suggestion introduce_suggestion
.push((param.span, format!("&'a {}", &snippet[1..]))); .push((param.span, format!("&'a {}", &snippet[1..])));
} else if snippet.starts_with("&'_ ") { } else if let Some(stripped) = snippet.strip_prefix("&'_ ") {
introduce_suggestion introduce_suggestion.push((param.span, format!("&'a {}", &stripped)));
.push((param.span, format!("&'a {}", &snippet[4..])));
} }
} }
} }

View file

@ -1574,7 +1574,7 @@ fn normalize_src(src: &mut String, start_pos: BytePos) -> Vec<NormalizedPos> {
/// Removes UTF-8 BOM, if any. /// Removes UTF-8 BOM, if any.
fn remove_bom(src: &mut String, normalized_pos: &mut Vec<NormalizedPos>) { fn remove_bom(src: &mut String, normalized_pos: &mut Vec<NormalizedPos>) {
if src.starts_with("\u{feff}") { if src.starts_with('\u{feff}') {
src.drain(..3); src.drain(..3);
normalized_pos.push(NormalizedPos { pos: BytePos(0), diff: 3 }); normalized_pos.push(NormalizedPos { pos: BytePos(0), diff: 3 });
} }

View file

@ -1388,11 +1388,7 @@ impl<'a, 'tcx> InferCtxtPrivExt<'tcx> for InferCtxt<'a, 'tcx> {
trait_ref: &ty::PolyTraitRef<'tcx>, trait_ref: &ty::PolyTraitRef<'tcx>,
) { ) {
let get_trait_impl = |trait_def_id| { let get_trait_impl = |trait_def_id| {
self.tcx.find_map_relevant_impl( self.tcx.find_map_relevant_impl(trait_def_id, trait_ref.skip_binder().self_ty(), Some)
trait_def_id,
trait_ref.skip_binder().self_ty(),
|impl_def_id| Some(impl_def_id),
)
}; };
let required_trait_path = self.tcx.def_path_str(trait_ref.def_id()); let required_trait_path = self.tcx.def_path_str(trait_ref.def_id());
let all_traits = self.tcx.all_traits(LOCAL_CRATE); let all_traits = self.tcx.all_traits(LOCAL_CRATE);

View file

@ -499,7 +499,7 @@ impl<'a, 'b, 'tcx> FulfillProcessor<'a, 'b, 'tcx> {
Err(ErrorHandled::TooGeneric) => { Err(ErrorHandled::TooGeneric) => {
pending_obligation.stalled_on = substs pending_obligation.stalled_on = substs
.iter() .iter()
.filter_map(|ty| TyOrConstInferVar::maybe_from_generic_arg(ty)) .filter_map(TyOrConstInferVar::maybe_from_generic_arg)
.collect(); .collect();
ProcessResult::Unchanged ProcessResult::Unchanged
} }