diff options
| author | bors <bors@rust-lang.org> | 2022-04-15 18:51:40 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-15 18:51:40 +0000 |
| commit | 3f391b84552f210adec7893b50c5da74f9362ae4 (patch) | |
| tree | bd7084e37d615bb22152fce22c7c9328f5316c4f /compiler/rustc_ast/src/token.rs | |
| parent | 1e6fe5855a115ef7f17f3e17205fab7340775701 (diff) | |
| parent | fa281fdf65f63da72abfef83abeb8bea37fddfd9 (diff) | |
| download | rust-3f391b84552f210adec7893b50c5da74f9362ae4.tar.gz rust-3f391b84552f210adec7893b50c5da74f9362ae4.zip | |
Auto merge of #96087 - Dylan-DPC:rollup-k6yzk55, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #94457 (Stabilize `derive_default_enum`) - #94461 (Create (unstable) 2024 edition) - #94849 (Check var scope if it exist) - #95194 (remove find_use_placement) - #95749 (only downgrade selection Error -> Ambiguous if type error is in predicate) - #96026 (couple of clippy::complexity fixes) - #96027 (remove function parameters only used in recursion) - #96034 ([test] Add test cases of untested functions for BTreeSet ) - #96040 (Use u32 instead of i32 for futexes.) - #96062 (docs: Update tests chapter for Termination stabilization) - #96065 (Refactor: Use `format-args-capture` and remove unnecessary nested blocks in rustc_typeck) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_ast/src/token.rs')
| -rw-r--r-- | compiler/rustc_ast/src/token.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_ast/src/token.rs b/compiler/rustc_ast/src/token.rs index 031c6cae793..5aa8011ca5e 100644 --- a/compiler/rustc_ast/src/token.rs +++ b/compiler/rustc_ast/src/token.rs @@ -722,7 +722,7 @@ impl NonterminalKind { Edition::Edition2015 | Edition::Edition2018 => { NonterminalKind::PatParam { inferred: true } } - Edition::Edition2021 => NonterminalKind::PatWithOr, + Edition::Edition2021 | Edition::Edition2024 => NonterminalKind::PatWithOr, }, sym::pat_param => NonterminalKind::PatParam { inferred: false }, sym::expr => NonterminalKind::Expr, |