dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #76888 - matthiaskrgr:clippy_single_match_2, r=Dylan-DPC 

use if let instead of single match arm expressions

use if let instead of single match arm expressions to compact code and reduce nesting (clippy::single_match)
This commit is contained in:
ecstatic-morse 2020-09-21 20:40:55 -07:00 committed by GitHub
parent 60b99015e9 c690c82ad4
commit dcf4d1f2be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compiler/rustc_infer/src/infer/error_reporting/nice_region_error/static_impl_trait.rs
View File

@ -488,18 +488,16 @@ impl<'tcx> Visitor<'tcx> for HirTraitObjectVisitor {
} }
fn visit_ty(&mut self, t: &'tcx hir::Ty<'tcx>) { fn visit_ty(&mut self, t: &'tcx hir::Ty<'tcx>) {
match t.kind { if let TyKind::TraitObject(
TyKind::TraitObject( poly_trait_refs,
poly_trait_refs, Lifetime { name: LifetimeName::ImplicitObjectLifetimeDefault, .. },
Lifetime { name: LifetimeName::ImplicitObjectLifetimeDefault, .. }, ) = t.kind
) => { {
for ptr in poly_trait_refs { for ptr in poly_trait_refs {
if Some(self.1) == ptr.trait_ref.trait_def_id() { if Some(self.1) == ptr.trait_ref.trait_def_id() {
self.0.push(ptr.span); self.0.push(ptr.span);
}
} }
} }
_ => {}
} }
walk_ty(self, t); walk_ty(self, t);
} }

11
compiler/rustc_middle/src/ty/error.rs
View File

@ -834,14 +834,11 @@ fn foo(&self) -> Self::T { String::new() }
kind: hir::ItemKind::Impl { items, .. }, .. kind: hir::ItemKind::Impl { items, .. }, ..
})) => { })) => {
for item in &items[..] { for item in &items[..] {
match item.kind { if let hir::AssocItemKind::Type = item.kind {
hir::AssocItemKind::Type => { if self.type_of(self.hir().local_def_id(item.id.hir_id)) == found {
if self.type_of(self.hir().local_def_id(item.id.hir_id)) == found { db.span_label(item.span, "expected this associated type");
db.span_label(item.span, "expected this associated type"); return true;
return true;
}
} }
_ => {}
} }
} }
} }

9
compiler/rustc_middle/src/ty/print/pretty.rs
View File

@ -2125,17 +2125,10 @@ fn for_each_def(tcx: TyCtxt<'_>, mut collect_fn: impl for<'b> FnMut(&'b Ident, N
// Iterate all local crate items no matter where they are defined. // Iterate all local crate items no matter where they are defined.
let hir = tcx.hir(); let hir = tcx.hir();
for item in hir.krate().items.values() { for item in hir.krate().items.values() {
if item.ident.name.as_str().is_empty() { if item.ident.name.as_str().is_empty() || matches!(item.kind, ItemKind::Use(_, _)) {
continue; continue;
} }
match item.kind {
ItemKind::Use(_, _) => {
continue;
}
_ => {}
}
if let Some(local_def_id) = hir.definitions().opt_hir_id_to_local_def_id(item.hir_id) { if let Some(local_def_id) = hir.definitions().opt_hir_id_to_local_def_id(item.hir_id) {
let def_id = local_def_id.to_def_id(); let def_id = local_def_id.to_def_id();
let ns = tcx.def_kind(def_id).ns().unwrap_or(Namespace::TypeNS); let ns = tcx.def_kind(def_id).ns().unwrap_or(Namespace::TypeNS);

16
compiler/rustc_mir/src/transform/promote_consts.rs
View File

@ -242,11 +242,8 @@ impl<'tcx> Visitor<'tcx> for Collector<'_, 'tcx> {
} }
TerminatorKind::InlineAsm { ref operands, .. } => { TerminatorKind::InlineAsm { ref operands, .. } => {
for (index, op) in operands.iter().enumerate() { for (index, op) in operands.iter().enumerate() {
match op { if let InlineAsmOperand::Const { .. } = op {
InlineAsmOperand::Const { .. } => { self.candidates.push(Candidate::InlineAsm { bb: location.block, index })
self.candidates.push(Candidate::InlineAsm { bb: location.block, index })
}
_ => {}
} }
} }
} }
@ -612,12 +609,9 @@ impl<'tcx> Validator<'_, 'tcx> {
let operand_ty = operand.ty(self.body, self.tcx); let operand_ty = operand.ty(self.body, self.tcx);
let cast_in = CastTy::from_ty(operand_ty).expect("bad input type for cast"); let cast_in = CastTy::from_ty(operand_ty).expect("bad input type for cast");
let cast_out = CastTy::from_ty(cast_ty).expect("bad output type for cast"); let cast_out = CastTy::from_ty(cast_ty).expect("bad output type for cast");
match (cast_in, cast_out) { if let (CastTy::Ptr(_) | CastTy::FnPtr, CastTy::Int(_)) = (cast_in, cast_out) {
(CastTy::Ptr(_) | CastTy::FnPtr, CastTy::Int(_)) => { // ptr-to-int casts are not possible in consts and thus not promotable
// ptr-to-int casts are not possible in consts and thus not promotable return Err(Unpromotable);
return Err(Unpromotable);
}
_ => {}
} }
} }

9
compiler/rustc_parse/src/lexer/tokentrees.rs
View File

@ -149,12 +149,9 @@ impl<'a> TokenTreesReader<'a> {
} }
} }
match (open_brace, delim) { //only add braces
//only add braces if let (DelimToken::Brace, DelimToken::Brace) = (open_brace, delim) {
(DelimToken::Brace, DelimToken::Brace) => { self.matching_block_spans.push((open_brace_span, close_brace_span));
self.matching_block_spans.push((open_brace_span, close_brace_span));
}
_ => {}
} }
if self.open_braces.is_empty() { if self.open_braces.is_empty() {

9
compiler/rustc_parse_format/src/lib.rs
View File

@ -525,12 +525,9 @@ impl<'a> Parser<'a> {
// fill character // fill character
if let Some(&(_, c)) = self.cur.peek() { if let Some(&(_, c)) = self.cur.peek() {
match self.cur.clone().nth(1) { if let Some((_, '>' | '<' | '^')) = self.cur.clone().nth(1) {
Some((_, '>' | '<' | '^')) => { spec.fill = Some(c);
spec.fill = Some(c); self.cur.next();
self.cur.next();
}
_ => {}
} }
} }
// Alignment // Alignment

7
compiler/rustc_resolve/src/lib.rs
View File

@ -534,11 +534,8 @@ impl<'a> ModuleData<'a> {
if ns != TypeNS { if ns != TypeNS {
return; return;
} }
match binding.res() { if let Res::Def(DefKind::Trait | DefKind::TraitAlias, _) = binding.res() {
Res::Def(DefKind::Trait | DefKind::TraitAlias, _) => { collected_traits.push((name, binding))
collected_traits.push((name, binding))
}
_ => (),
} }
}); });
*traits = Some(collected_traits.into_boxed_slice()); *traits = Some(collected_traits.into_boxed_slice());

7
compiler/rustc_symbol_mangling/src/v0.rs
View File

@ -152,11 +152,8 @@ impl SymbolMangler<'tcx> {
let _ = write!(self.out, "{}", ident.len()); let _ = write!(self.out, "{}", ident.len());
// Write a separating `_` if necessary (leading digit or `_`). // Write a separating `_` if necessary (leading digit or `_`).
match ident.chars().next() { if let Some('_' | '0'..='9') = ident.chars().next() {
Some('_' | '0'..='9') => { self.push("_");
self.push("_");
}
_ => {}
} }
self.push(ident); self.push(ident);