diff options
| author | bors <bors@rust-lang.org> | 2025-09-11 16:11:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-09-11 16:11:18 +0000 |
| commit | 67cb8e039bd8df7ca6c38828756cc22ce335724e (patch) | |
| tree | d56c2e7f35cb341e3af771e2aba92446f8aab03d /compiler/rustc_parse/src/parser | |
| parent | f946d4d344d85eb2ddbd675cd46cb38a705faccc (diff) | |
| parent | 58afb55adc1e4b66c39870da5a1b0a11aa129225 (diff) | |
Auto merge of #146443 - fmease:beta-less-greedy-maybe-const-bounds, r=fmease
[beta] Backport "Less greedily parse `[const]` bounds" Backport of rust-lang/rust#146422. Following https://forge.rust-lang.org/release/backporting.html#beta-backporting-in-rust-langrust. Not part of some hypothetical future backport rollup because we're under time pressure as release procedures will commence very soon: https://forge.rust-lang.org/#current-release-versions, https://forge.rust-lang.org/release/process.html. cc `@cuviper`
Diffstat (limited to 'compiler/rustc_parse/src/parser')
| -rw-r--r-- | compiler/rustc_parse/src/parser/ty.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs index 740dd10ea8b..6827a9f23a4 100644 --- a/compiler/rustc_parse/src/parser/ty.rs +++ b/compiler/rustc_parse/src/parser/ty.rs @@ -951,12 +951,18 @@ impl<'a> Parser<'a> { || self.check(exp!(Tilde)) || self.check_keyword(exp!(For)) || self.check(exp!(OpenParen)) - || self.check(exp!(OpenBracket)) + || self.can_begin_maybe_const_bound() || self.check_keyword(exp!(Const)) || self.check_keyword(exp!(Async)) || self.check_keyword(exp!(Use)) } + fn can_begin_maybe_const_bound(&mut self) -> bool { + self.check(exp!(OpenBracket)) + && self.look_ahead(1, |t| t.is_keyword(kw::Const)) + && self.look_ahead(2, |t| *t == token::CloseBracket) + } + /// Parses a bound according to the grammar: /// ```ebnf /// BOUND = TY_BOUND | LT_BOUND @@ -1137,10 +1143,7 @@ impl<'a> Parser<'a> { let span = tilde.to(self.prev_token.span); self.psess.gated_spans.gate(sym::const_trait_impl, span); BoundConstness::Maybe(span) - } else if self.check(exp!(OpenBracket)) - && self.look_ahead(1, |t| t.is_keyword(kw::Const)) - && self.look_ahead(2, |t| *t == token::CloseBracket) - { + } else if self.can_begin_maybe_const_bound() { let start = self.token.span; self.bump(); self.expect_keyword(exp!(Const)).unwrap(); |
