diff options
| author | bors <bors@rust-lang.org> | 2024-12-03 18:16:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-03 18:16:53 +0000 |
| commit | c44b3d50fea96a3e0417e8264c16ea21a0a3fca2 (patch) | |
| tree | 0eb03dafc4109b03650a8f88daace7dbc1e93bf0 /compiler/rustc_parse/src | |
| parent | 490b2cc09860dd62a7595bb07364d71c12ce4e60 (diff) | |
| parent | b78ab2fdc1ae11578bec633f8745d819ea526d90 (diff) | |
| download | rust-c44b3d50fea96a3e0417e8264c16ea21a0a3fca2.tar.gz rust-c44b3d50fea96a3e0417e8264c16ea21a0a3fca2.zip | |
Auto merge of #133803 - matthiaskrgr:rollup-8ag5ncy, r=matthiaskrgr
Rollup of 9 pull requests
Successful merges:
- #132612 (Gate async fn trait bound modifier on `async_trait_bounds`)
- #133545 (Lint against Symbol::intern on a string literal)
- #133558 (Structurally resolve in `probe_adt`)
- #133696 (stabilize const_collections_with_hasher and build_hasher_default_const_new)
- #133753 (Reduce false positives on some common cases from if-let-rescope lint)
- #133762 (stabilize const_{size,align}_of_val)
- #133777 (document -Zrandomize-layout in the unstable book)
- #133779 (Use correct `hir_id` for array const arg infers)
- #133796 (Update the definition of `borrowing_sub`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src')
| -rw-r--r-- | compiler/rustc_parse/src/parser/ty.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/rustc_parse/src/parser/ty.rs b/compiler/rustc_parse/src/parser/ty.rs index 505586e74f1..8cff23c2e32 100644 --- a/compiler/rustc_parse/src/parser/ty.rs +++ b/compiler/rustc_parse/src/parser/ty.rs @@ -9,7 +9,7 @@ use rustc_ast::{ }; use rustc_errors::{Applicability, PResult}; use rustc_span::symbol::{Ident, kw, sym}; -use rustc_span::{ErrorGuaranteed, Span, Symbol}; +use rustc_span::{ErrorGuaranteed, Span}; use thin_vec::{ThinVec, thin_vec}; use super::{Parser, PathStyle, SeqSep, TokenType, Trailing}; @@ -940,7 +940,7 @@ impl<'a> Parser<'a> { let asyncness = if self.token.uninterpolated_span().at_least_rust_2018() && self.eat_keyword(kw::Async) { - self.psess.gated_spans.gate(sym::async_closure, self.prev_token.span); + self.psess.gated_spans.gate(sym::async_trait_bounds, self.prev_token.span); BoundAsyncness::Async(self.prev_token.span) } else if self.may_recover() && self.token.uninterpolated_span().is_rust_2015() @@ -951,7 +951,7 @@ impl<'a> Parser<'a> { span: self.prev_token.span, help: HelpUseLatestEdition::new(), }); - self.psess.gated_spans.gate(sym::async_closure, self.prev_token.span); + self.psess.gated_spans.gate(sym::async_trait_bounds, self.prev_token.span); BoundAsyncness::Async(self.prev_token.span) } else { BoundAsyncness::Normal @@ -1136,7 +1136,7 @@ impl<'a> Parser<'a> { Some(ast::Path { span: fn_token_span.to(self.prev_token.span), segments: thin_vec