Skip to content

Commit 7c3e305

Browse files
borsbors
committed
Auto merge of #121523 - matthiaskrgr:comp_comp, r=Nilstrieb
compiler: clippy::complexity fixes
2 parents 8f359be + 86a7fc8 commit 7c3e305

File tree

23 files changed

+62
-95
lines changed

23 files changed

+62
-95
lines changed

‎compiler/rustc_ast_lowering/src/delegation.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
138138
} else {
139139
self.tcx.fn_arg_names(sig_id).len()
140140
};
141-
let inputs = self.arena.alloc_from_iter((0..args_count).into_iter().map(|arg| hir::Ty {
141+
let inputs = self.arena.alloc_from_iter((0..args_count).map(|arg| hir::Ty {
142142
hir_id: self.next_id(),
143143
kind: hir::TyKind::InferDelegation(sig_id, hir::InferDelegationKind::Input(arg)),
144144
span: self.lower_span(param_span),

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1559,7 +1559,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {
15591559
// A bare path doesn't need a `let` assignment, it's already a simple
15601560
// binding access.
15611561
// As a new binding wasn't added, we don't need to modify the advancing call.
1562-
sugg.push((loop_span.with_hi(pat_span.lo()), format!("while let Some(")));
1562+
sugg.push((loop_span.with_hi(pat_span.lo()), "while let Some(".to_string()));
15631563
sugg.push((
15641564
pat_span.shrink_to_hi().with_hi(head.span.lo()),
15651565
") = ".to_string(),

‎compiler/rustc_borrowck/src/diagnostics/outlives_suggestion.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -134,14 +134,13 @@ impl OutlivesSuggestionBuilder {
134134

135135
for (r, bound) in unified.into_iter() {
136136
if !unified_already.contains(fr) {
137-
suggested.push(SuggestedConstraint::Equal(fr_name.clone(), bound));
137+
suggested.push(SuggestedConstraint::Equal(fr_name, bound));
138138
unified_already.insert(r);
139139
}
140140
}
141141

142142
if !other.is_empty() {
143-
let other =
144-
other.iter().map(|(_, rname)| rname.clone()).collect::<SmallVec<_>>();
143+
let other = other.iter().map(|(_, rname)| *rname).collect::<SmallVec<_>>();
145144
suggested.push(SuggestedConstraint::Outlives(fr_name, other))
146145
}
147146
}

‎compiler/rustc_borrowck/src/diagnostics/region_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
280280
.iter()
281281
.rfind(|param| param.def_id.to_def_id() == defid)
282282
.is_some() {
283-
suggestions.push((bounded_span.shrink_to_hi(), format!(" + 'static")));
283+
suggestions.push((bounded_span.shrink_to_hi(), " + 'static".to_string()));
284284
}
285285
});
286286
});

‎compiler/rustc_const_eval/src/interpret/intern.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ pub fn intern_const_alloc_recursive<
140140
alloc.1.mutability = base_mutability;
141141
alloc.1.provenance().ptrs().iter().map(|&(_, prov)| prov).collect()
142142
} else {
143-
intern_shallow(ecx, base_alloc_id, base_mutability).unwrap().map(|prov| prov).collect()
143+
intern_shallow(ecx, base_alloc_id, base_mutability).unwrap().collect()
144144
};
145145
// We need to distinguish "has just been interned" from "was already in `tcx`",
146146
// so we track this in a separate set.
@@ -277,7 +277,7 @@ impl<'mir, 'tcx: 'mir, M: super::intern::CompileTimeMachine<'mir, 'tcx, !>>
277277
// We are not doing recursive interning, so we don't currently support provenance.
278278
// (If this assertion ever triggers, we should just implement a
279279
// proper recursive interning loop -- or just call `intern_const_alloc_recursive`.
280-
if !self.tcx.try_get_global_alloc(prov.alloc_id()).is_some() {
280+
if self.tcx.try_get_global_alloc(prov.alloc_id()).is_none() {
281281
panic!("`intern_with_temp_alloc` with nested allocations");
282282
}
283283
}

‎compiler/rustc_errors/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,7 @@ impl DiagCtxt {
844844
.emitted_diagnostic_codes
845845
.iter()
846846
.filter_map(|&code| {
847-
if registry.try_find_description(code).is_ok().clone() {
847+
if registry.try_find_description(code).is_ok() {
848848
Some(code.to_string())
849849
} else {
850850
None

‎compiler/rustc_expand/src/mbe/transcribe.rs

+3-12
Original file line numberDiff line numberDiff line change
@@ -555,23 +555,14 @@ fn count_repetitions<'a>(
555555
) -> PResult<'a, usize> {
556556
// Recursively count the number of matches in `matched` at given depth
557557
// (or at the top-level of `matched` if no depth is given).
558-
fn count<'a>(
559-
cx: &ExtCtxt<'a>,
560-
depth_curr: usize,
561-
depth_max: usize,
562-
matched: &NamedMatch,
563-
sp: &DelimSpan,
564-
) -> PResult<'a, usize> {
558+
fn count<'a>(depth_curr: usize, depth_max: usize, matched: &NamedMatch) -> PResult<'a, usize> {
565559
match matched {
566560
MatchedTokenTree(_) | MatchedNonterminal(_) => Ok(1),
567561
MatchedSeq(named_matches) => {
568562
if depth_curr == depth_max {
569563
Ok(named_matches.len())
570564
} else {
571-
named_matches
572-
.iter()
573-
.map(|elem| count(cx, depth_curr + 1, depth_max, elem, sp))
574-
.sum()
565+
named_matches.iter().map(|elem| count(depth_curr + 1, depth_max, elem)).sum()
575566
}
576567
}
577568
}
@@ -612,7 +603,7 @@ fn count_repetitions<'a>(
612603
return Err(cx.dcx().create_err(CountRepetitionMisplaced { span: sp.entire() }));
613604
}
614605

615-
count(cx, depth_user, depth_max, matched, sp)
606+
count(depth_user, depth_max, matched)
616607
}
617608

618609
/// Returns a `NamedMatch` item declared on the LHS given an arbitrary [Ident]

‎compiler/rustc_hir_typeck/src/_match.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -401,12 +401,12 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
401401
{
402402
// check that the `if` expr without `else` is the fn body's expr
403403
if expr.span == sp {
404-
return self.get_fn_decl(hir_id).and_then(|(_, fn_decl, _)| {
404+
return self.get_fn_decl(hir_id).map(|(_, fn_decl, _)| {
405405
let (ty, span) = match fn_decl.output {
406406
hir::FnRetTy::DefaultReturn(span) => ("()".to_string(), span),
407407
hir::FnRetTy::Return(ty) => (ty_to_string(ty), ty.span),
408408
};
409-
Some((span, format!("expected `{ty}` because of this return type")))
409+
(span, format!("expected `{ty}` because of this return type"))
410410
});
411411
}
412412
}

‎compiler/rustc_hir_typeck/src/fn_ctxt/_impl.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -846,15 +846,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
846846
let item_name = item_segment.ident;
847847
let result = self
848848
.resolve_fully_qualified_call(span, item_name, ty.normalized, qself.span, hir_id)
849-
.and_then(|r| {
849+
.map(|r| {
850850
// lint bare trait if the method is found in the trait
851851
if span.edition().at_least_rust_2021()
852852
&& let Some(diag) =
853853
self.dcx().steal_diagnostic(qself.span, StashKey::TraitMissingMethod)
854854
{
855855
diag.emit();
856856
}
857-
Ok(r)
857+
r
858858
})
859859
.or_else(|error| {
860860
let guar = self

‎compiler/rustc_hir_typeck/src/fn_ctxt/checks.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -555,9 +555,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
555555
{
556556
let args = self.infcx.fresh_args_for_item(call_name.span, assoc.def_id);
557557
let fn_sig = tcx.fn_sig(assoc.def_id).instantiate(tcx, args);
558-
let fn_sig =
559-
self.instantiate_binder_with_fresh_vars(call_name.span, FnCall, fn_sig);
560-
Some((assoc, fn_sig));
558+
559+
self.instantiate_binder_with_fresh_vars(call_name.span, FnCall, fn_sig);
561560
}
562561
None
563562
};

‎compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

+9-14
Original file line numberDiff line numberDiff line change
@@ -1061,20 +1061,15 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10611061
return;
10621062
}
10631063

1064-
let scope = self
1065-
.tcx
1066-
.hir()
1067-
.parent_iter(id)
1068-
.filter(|(_, node)| {
1069-
matches!(
1070-
node,
1071-
Node::Expr(Expr { kind: ExprKind::Closure(..), .. })
1072-
| Node::Item(_)
1073-
| Node::TraitItem(_)
1074-
| Node::ImplItem(_)
1075-
)
1076-
})
1077-
.next();
1064+
let scope = self.tcx.hir().parent_iter(id).find(|(_, node)| {
1065+
matches!(
1066+
node,
1067+
Node::Expr(Expr { kind: ExprKind::Closure(..), .. })
1068+
| Node::Item(_)
1069+
| Node::TraitItem(_)
1070+
| Node::ImplItem(_)
1071+
)
1072+
});
10781073
let in_closure =
10791074
matches!(scope, Some((_, Node::Expr(Expr { kind: ExprKind::Closure(..), .. }))));
10801075

‎compiler/rustc_hir_typeck/src/method/suggest.rs

+2-6
Original file line numberDiff line numberDiff line change
@@ -370,9 +370,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
370370
};
371371
if let Some(file) = file {
372372
err.note(format!("the full type name has been written to '{}'", file.display()));
373-
err.note(format!(
374-
"consider using `--verbose` to print the full type name to the console"
375-
));
373+
err.note("consider using `--verbose` to print the full type name to the console");
376374
}
377375

378376
err
@@ -497,9 +495,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
497495

498496
if let Some(file) = ty_file {
499497
err.note(format!("the full type name has been written to '{}'", file.display(),));
500-
err.note(format!(
501-
"consider using `--verbose` to print the full type name to the console"
502-
));
498+
err.note("consider using `--verbose` to print the full type name to the console");
503499
}
504500
if rcvr_ty.references_error() {
505501
err.downgrade_to_delayed_bug();

‎compiler/rustc_hir_typeck/src/pat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2035,7 +2035,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
20352035
slice: Option<&'tcx Pat<'tcx>>,
20362036
span: Span,
20372037
) -> Option<Ty<'tcx>> {
2038-
if !slice.is_none() {
2038+
if slice.is_some() {
20392039
return None;
20402040
}
20412041

‎compiler/rustc_infer/src/infer/error_reporting/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
19381938
"the full type name has been written to '{}'",
19391939
path.display(),
19401940
));
1941-
diag.note(format!("consider using `--verbose` to print the full type name to the console"));
1941+
diag.note("consider using `--verbose` to print the full type name to the console");
19421942
}
19431943
}
19441944
}

‎compiler/rustc_middle/src/ty/print/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ pub trait Printer<'tcx>: Sized {
139139
_,
140140
hir::CoroutineSource::Closure,
141141
)) = self.tcx().coroutine_kind(def_id)
142-
&& args.len() >= parent_args.len() + 1
142+
&& args.len() > parent_args.len()
143143
{
144144
return self.path_generic_args(
145145
|cx| cx.print_def_path(def_id, parent_args),

‎compiler/rustc_mir_build/src/thir/pattern/mod.rs

+7-12
Original file line numberDiff line numberDiff line change
@@ -223,19 +223,14 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> {
223223
// If we are handling a range with associated constants (e.g.
224224
// `Foo::<'a>::A..=Foo::B`), we need to put the ascriptions for the associated
225225
// constants somewhere. Have them on the range pattern.
226-
for ascr in [lo_ascr, hi_ascr] {
227-
if let Some(ascription) = ascr {
228-
kind = PatKind::AscribeUserType {
229-
ascription,
230-
subpattern: Box::new(Pat { span, ty, kind }),
231-
};
232-
}
226+
for ascription in [lo_ascr, hi_ascr].into_iter().flatten() {
227+
kind = PatKind::AscribeUserType {
228+
ascription,
229+
subpattern: Box::new(Pat { span, ty, kind }),
230+
};
233231
}
234-
for inline_const in [lo_inline, hi_inline] {
235-
if let Some(def) = inline_const {
236-
kind =
237-
PatKind::InlineConstant { def, subpattern: Box::new(Pat { span, ty, kind }) };
238-
}
232+
for def in [lo_inline, hi_inline].into_iter().flatten() {
233+
kind = PatKind::InlineConstant { def, subpattern: Box::new(Pat { span, ty, kind }) };
239234
}
240235
Ok(kind)
241236
}

‎compiler/rustc_parse/src/validate_attr.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub fn parse_meta<'a>(sess: &'a ParseSess, attr: &Attribute) -> PResult<'a, Meta
8888
// results in `ast::ExprKind::Err`. In that case we delay
8989
// the error because an earlier error will have already
9090
// been reported.
91-
let msg = format!("attribute value must be a literal");
91+
let msg = "attribute value must be a literal";
9292
let mut err = sess.dcx.struct_span_err(expr.span, msg);
9393
if let ast::ExprKind::Err = expr.kind {
9494
err.downgrade_to_delayed_bug();

‎compiler/rustc_pattern_analysis/src/constructor.rs

+6-10
Original file line numberDiff line numberDiff line change
@@ -694,18 +694,14 @@ impl<Cx: TypeCx> Clone for Constructor<Cx> {
694694
fn clone(&self) -> Self {
695695
match self {
696696
Constructor::Struct => Constructor::Struct,
697-
Constructor::Variant(idx) => Constructor::Variant(idx.clone()),
697+
Constructor::Variant(idx) => Constructor::Variant(*idx),
698698
Constructor::Ref => Constructor::Ref,
699-
Constructor::Slice(slice) => Constructor::Slice(slice.clone()),
699+
Constructor::Slice(slice) => Constructor::Slice(*slice),
700700
Constructor::UnionField => Constructor::UnionField,
701-
Constructor::Bool(b) => Constructor::Bool(b.clone()),
702-
Constructor::IntRange(range) => Constructor::IntRange(range.clone()),
703-
Constructor::F32Range(lo, hi, end) => {
704-
Constructor::F32Range(lo.clone(), hi.clone(), end.clone())
705-
}
706-
Constructor::F64Range(lo, hi, end) => {
707-
Constructor::F64Range(lo.clone(), hi.clone(), end.clone())
708-
}
701+
Constructor::Bool(b) => Constructor::Bool(*b),
702+
Constructor::IntRange(range) => Constructor::IntRange(*range),
703+
Constructor::F32Range(lo, hi, end) => Constructor::F32Range(lo.clone(), *hi, *end),
704+
Constructor::F64Range(lo, hi, end) => Constructor::F64Range(lo.clone(), *hi, *end),
709705
Constructor::Str(value) => Constructor::Str(value.clone()),
710706
Constructor::Opaque(inner) => Constructor::Opaque(inner.clone()),
711707
Constructor::Or => Constructor::Or,

‎compiler/rustc_resolve/src/late/diagnostics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@ impl<'a: 'ast, 'ast, 'tcx> LateResolutionVisitor<'a, '_, 'ast, 'tcx> {
15821582
None => ("/* fields */".to_string(), Applicability::HasPlaceholders),
15831583
};
15841584
let pad = match field_ids {
1585-
Some(field_ids) if field_ids.is_empty() => "",
1585+
Some([]) => "",
15861586
_ => " ",
15871587
};
15881588
err.span_suggestion(

‎compiler/rustc_session/src/session.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ fn validate_commandline_args_with_session_available(sess: &Session) {
12641264
// LLVM CFI using rustc LTO requires a single codegen unit.
12651265
if sess.is_sanitizer_cfi_enabled()
12661266
&& sess.lto() == config::Lto::Fat
1267-
&& !(sess.codegen_units().as_usize() == 1)
1267+
&& (sess.codegen_units().as_usize() != 1)
12681268
{
12691269
sess.dcx().emit_err(errors::SanitizerCfiRequiresSingleCodegenUnit);
12701270
}

‎compiler/rustc_smir/src/rustc_smir/context.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,10 @@ impl<'tcx> Context for TablesWrapper<'tcx> {
208208
let crates: Vec<stable_mir::Crate> = [LOCAL_CRATE]
209209
.iter()
210210
.chain(tables.tcx.crates(()).iter())
211-
.map(|crate_num| {
211+
.filter_map(|crate_num| {
212212
let crate_name = tables.tcx.crate_name(*crate_num).to_string();
213213
(name == crate_name).then(|| smir_crate(tables.tcx, *crate_num))
214214
})
215-
.flatten()
216215
.collect();
217216
crates
218217
}

‎compiler/rustc_trait_selection/src/traits/error_reporting/suggestions.rs

+12-12
Original file line numberDiff line numberDiff line change
@@ -1283,9 +1283,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
12831283
"the full type name has been written to '{}'",
12841284
file.display()
12851285
));
1286-
err.note(format!(
1287-
"consider using `--verbose` to print full type name to the console"
1288-
));
1286+
err.note(
1287+
"consider using `--verbose` to print full type name to the console",
1288+
);
12891289
}
12901290

12911291
if imm_ref_self_ty_satisfies_pred && mut_ref_self_ty_satisfies_pred {
@@ -2869,9 +2869,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
28692869
"the full name for the type has been written to '{}'",
28702870
file.display(),
28712871
));
2872-
err.note(format!(
2873-
"consider using `--verbose` to print the full type name to the console"
2874-
));
2872+
err.note(
2873+
"consider using `--verbose` to print the full type name to the console",
2874+
);
28752875
}
28762876
}
28772877
ObligationCauseCode::RepeatElementCopy {
@@ -3339,9 +3339,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
33393339
"the full type name has been written to '{}'",
33403340
file.display(),
33413341
));
3342-
err.note(format!(
3343-
"consider using `--verbose` to print the full type name to the console"
3344-
));
3342+
err.note(
3343+
"consider using `--verbose` to print the full type name to the console",
3344+
);
33453345
}
33463346
let mut parent_predicate = parent_trait_pred;
33473347
let mut data = &data.derived;
@@ -3395,9 +3395,9 @@ impl<'tcx> TypeErrCtxt<'_, 'tcx> {
33953395
"the full type name has been written to '{}'",
33963396
file.display(),
33973397
));
3398-
err.note(format!(
3399-
"consider using `--verbose` to print the full type name to the console"
3400-
));
3398+
err.note(
3399+
"consider using `--verbose` to print the full type name to the console",
3400+
);
34013401
}
34023402
}
34033403
// #74711: avoid a stack overflow

‎compiler/rustc_trait_selection/src/traits/project.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -1031,12 +1031,9 @@ fn assemble_candidates_from_impls<'cx, 'tcx>(
10311031
{
10321032
candidate_set.mark_ambiguous();
10331033
true
1034-
} else if obligation.predicate.args.type_at(0).to_opt_closure_kind().is_some()
1035-
&& obligation.predicate.args.type_at(1).to_opt_closure_kind().is_some()
1036-
{
1037-
true
10381034
} else {
1039-
false
1035+
obligation.predicate.args.type_at(0).to_opt_closure_kind().is_some()
1036+
&& obligation.predicate.args.type_at(1).to_opt_closure_kind().is_some()
10401037
}
10411038
} else if lang_items.discriminant_kind_trait() == Some(trait_ref.def_id) {
10421039
match self_ty.kind() {

0 commit comments

Comments
 (0)