Skip to content

Commit 65dcdc8

Browse files
committed
Auto merge of #137163 - matthiaskrgr:rollup-ovgfkns, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #136466 (Start removing `rustc_middle::hir::map::Map`) - #136671 (Overhaul `rustc_middle::limits`) - #136817 (Pattern Migration 2024: clean up and comment) - #136844 (Use `const_error!` when possible) - #137080 (bootstrap: add more tracing to compiler/std/llvm flows) - #137101 (`invalid_from_utf8[_unchecked]`: also lint inherent methods) - #137140 (Fix const items not being allowed to be called `r#move` or `r#static`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 1aac875 + b578c91 commit 65dcdc8

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ impl<'db> MatchCheckCtx<'db> {
9595

9696
let place_validity = PlaceValidity::from_bool(known_valid_scrutinee.unwrap_or(true));
9797
// Measured to take ~100ms on modern hardware.
98-
let complexity_limit = Some(500000);
98+
let complexity_limit = 500000;
9999
compute_match_usefulness(self, arms, scrut_ty, place_validity, complexity_limit)
100100
}
101101

crates/ide-db/src/generated/lints.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9107,8 +9107,8 @@ The tracking issue for this feature is: [#27721]
91079107
deny_since: None,
91089108
},
91099109
Lint {
9110-
label: "pattern_complexity",
9111-
description: r##"# `pattern_complexity`
9110+
label: "pattern_complexity_limit",
9111+
description: r##"# `pattern_complexity_limit`
91129112

91139113
This feature has no tracking issue, and is therefore likely internal to the compiler, not being intended for general use.
91149114

0 commit comments

Comments
 (0)