diff options
| author | bors <bors@rust-lang.org> | 2024-04-18 07:26:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-18 07:26:15 +0000 |
| commit | ecd45472f800ee946e23cd68361f4ce5ccaf9433 (patch) | |
| tree | f3286483d996cd2e04f5314d3e4045d16636679e /compiler/rustc_parse/src/parser/diagnostics.rs | |
| parent | b1248bc60da40f03c91f3f7135e964d8e6626d4c (diff) | |
| parent | 5543da9aec9088931786431025c3d10f56e07727 (diff) | |
| download | rust-ecd45472f800ee946e23cd68361f4ce5ccaf9433.tar.gz rust-ecd45472f800ee946e23cd68361f4ce5ccaf9433.zip | |
Auto merge of #124111 - matthiaskrgr:rollup-cmmkryf, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #124041 (Fix copy path button) - #124047 (Match ergonomics 2024: miscellaneous code cleanups) - #124064 (Move confusing comment about otherwise blocks in `lower_match_tree`) - #124090 (llvm: update riscv target feature to match LLVM 19) - #124100 (fix: make `str::from_raw_parts_mut` `mut`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_parse/src/parser/diagnostics.rs')
| -rw-r--r-- | compiler/rustc_parse/src/parser/diagnostics.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_parse/src/parser/diagnostics.rs b/compiler/rustc_parse/src/parser/diagnostics.rs index 64f766543a7..f256dbf4360 100644 --- a/compiler/rustc_parse/src/parser/diagnostics.rs +++ b/compiler/rustc_parse/src/parser/diagnostics.rs @@ -29,7 +29,7 @@ use rustc_ast::token::{self, Delimiter, Lit, LitKind, Token, TokenKind}; use rustc_ast::tokenstream::AttrTokenTree; use rustc_ast::util::parser::AssocOp; use rustc_ast::{ - AngleBracketedArg, AngleBracketedArgs, AnonConst, AttrVec, BinOpKind, BindingAnnotation, Block, + AngleBracketedArg, AngleBracketedArgs, AnonConst, AttrVec, BinOpKind, BindingMode, Block, BlockCheckMode, Expr, ExprKind, GenericArg, Generics, HasTokens, Item, ItemKind, Param, Pat, PatKind, Path, PathSegment, QSelf, Ty, TyKind, }; @@ -51,7 +51,7 @@ use thin_vec::{thin_vec, ThinVec}; pub(super) fn dummy_arg(ident: Ident, guar: ErrorGuaranteed) -> Param { let pat = P(Pat { id: ast::DUMMY_NODE_ID, - kind: PatKind::Ident(BindingAnnotation::NONE, ident, None), + kind: PatKind::Ident(BindingMode::NONE, ident, None), span: ident.span, tokens: None, }); @@ -2787,7 +2787,7 @@ impl<'a> Parser<'a> { } _ => {} }, - PatKind::Ident(BindingAnnotation::NONE, ident, None) => { + PatKind::Ident(BindingMode::NONE, ident, None) => { match &first_pat.kind { PatKind::Ident(_, old_ident, _) => { let path = PatKind::Path( |