Merge from rust-lang/rust

This commit is contained in:
Laurențiu Nicola 2025-02-17 13:20:12 +02:00
commit bec6d6fbe3
3 changed files with 4 additions and 4 deletions

View File

@ -95,7 +95,7 @@ impl<'db> MatchCheckCtx<'db> {
let place_validity = PlaceValidity::from_bool(known_valid_scrutinee.unwrap_or(true)); let place_validity = PlaceValidity::from_bool(known_valid_scrutinee.unwrap_or(true));
// Measured to take ~100ms on modern hardware. // Measured to take ~100ms on modern hardware.
let complexity_limit = Some(500000); let complexity_limit = 500000;
compute_match_usefulness(self, arms, scrut_ty, place_validity, complexity_limit) compute_match_usefulness(self, arms, scrut_ty, place_validity, complexity_limit)
} }

View File

@ -399,7 +399,7 @@ impl InferenceTable<'_> {
// Check that the types which they point at are compatible. // Check that the types which they point at are compatible.
let from_raw = TyKind::Raw(to_mt, from_inner.clone()).intern(Interner); let from_raw = TyKind::Raw(to_mt, from_inner.clone()).intern(Interner);
// Although references and unsafe ptrs have the same // Although references and raw ptrs have the same
// representation, we still register an Adjust::DerefRef so that // representation, we still register an Adjust::DerefRef so that
// regionck knows that the region for `a` must be valid here. // regionck knows that the region for `a` must be valid here.
if is_ref { if is_ref {

View File

@ -9107,8 +9107,8 @@ The tracking issue for this feature is: [#27721]
deny_since: None, deny_since: None,
}, },
Lint { Lint {
label: "pattern_complexity", label: "pattern_complexity_limit",
description: r##"# `pattern_complexity` description: r##"# `pattern_complexity_limit`
This feature has no tracking issue, and is therefore likely internal to the compiler, not being intended for general use. This feature has no tracking issue, and is therefore likely internal to the compiler, not being intended for general use.