Skip to content

Commit c75587a

Browse files
rust-timerrust-timer
authored
Unrolled build for rust-lang#119967
Rollup merge of rust-lang#119967 - ShE3py:patkind-err, r=WaffleLapkin Add `PatKind::Err` to AST/HIR rust-lang#116715 added `thir::PatKind::Error`; this PR adds `hir::PatKind::Err` and `ast::PatKind::Err` (see rust-lang#118625 (comment).) --- ``@rustbot`` label +A-patterns r? WaffleLapkin
2 parents a34faab + 7889e99 commit c75587a

File tree

23 files changed

+66
-24
lines changed

23 files changed

+66
-24
lines changed

‎compiler/rustc_ast/src/ast.rs

+5-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,8 @@ impl Pat {
625625
| PatKind::Range(..)
626626
| PatKind::Ident(..)
627627
| PatKind::Path(..)
628-
| PatKind::MacCall(_) => {}
628+
| PatKind::MacCall(_)
629+
| PatKind::Err(_) => {}
629630
}
630631
}
631632

@@ -809,6 +810,9 @@ pub enum PatKind {
809810

810811
/// A macro pattern; pre-expansion.
811812
MacCall(P<MacCall>),
813+
814+
/// Placeholder for a pattern that wasn't syntactically well formed in some way.
815+
Err(ErrorGuaranteed),
812816
}
813817

814818
/// Whether the `..` is present in a struct fields pattern.

‎compiler/rustc_ast/src/mut_visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,7 @@ pub fn noop_visit_pat<T: MutVisitor>(pat: &mut P<Pat>, vis: &mut T) {
12671267
let Pat { id, kind, span, tokens } = pat.deref_mut();
12681268
vis.visit_id(id);
12691269
match kind {
1270-
PatKind::Wild | PatKind::Rest | PatKind::Never => {}
1270+
PatKind::Wild | PatKind::Rest | PatKind::Never | PatKind::Err(_) => {}
12711271
PatKind::Ident(_binding_mode, ident, sub) => {
12721272
vis.visit_ident(ident);
12731273
visit_opt(sub, |sub| vis.visit_pat(sub));

‎compiler/rustc_ast/src/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -568,7 +568,7 @@ pub fn walk_pat<'a, V: Visitor<'a>>(visitor: &mut V, pattern: &'a Pat) {
568568
walk_list!(visitor, visit_expr, lower_bound);
569569
walk_list!(visitor, visit_expr, upper_bound);
570570
}
571-
PatKind::Wild | PatKind::Rest | PatKind::Never => {}
571+
PatKind::Wild | PatKind::Rest | PatKind::Never | PatKind::Err(_) => {}
572572
PatKind::Tuple(elems) | PatKind::Slice(elems) | PatKind::Or(elems) => {
573573
walk_list!(visitor, visit_pat, elems);
574574
}

‎compiler/rustc_ast_lowering/src/pat.rs

+1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
109109
// return inner to be processed in next loop
110110
PatKind::Paren(inner) => pattern = inner,
111111
PatKind::MacCall(_) => panic!("{:?} shouldn't exist here", pattern.span),
112+
PatKind::Err(guar) => break hir::PatKind::Err(*guar),
112113
}
113114
};
114115

‎compiler/rustc_ast_pretty/src/pprust/state.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1519,6 +1519,11 @@ impl<'a> State<'a> {
15191519
self.pclose();
15201520
}
15211521
PatKind::MacCall(m) => self.print_mac(m),
1522+
PatKind::Err(_) => {
1523+
self.popen();
1524+
self.word("/*ERROR*/");
1525+
self.pclose();
1526+
}
15221527
}
15231528
self.ann.post(self, AnnNode::Pat(pat))
15241529
}

‎compiler/rustc_hir/src/hir.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ impl<'hir> Pat<'hir> {
10151015

10161016
use PatKind::*;
10171017
match self.kind {
1018-
Wild | Never | Lit(_) | Range(..) | Binding(.., None) | Path(_) => true,
1018+
Wild | Never | Lit(_) | Range(..) | Binding(.., None) | Path(_) | Err(_) => true,
10191019
Box(s) | Ref(s, _) | Binding(.., Some(s)) => s.walk_short_(it),
10201020
Struct(_, fields, _) => fields.iter().all(|field| field.pat.walk_short_(it)),
10211021
TupleStruct(_, s, _) | Tuple(s, _) | Or(s) => s.iter().all(|p| p.walk_short_(it)),
@@ -1042,7 +1042,7 @@ impl<'hir> Pat<'hir> {
10421042

10431043
use PatKind::*;
10441044
match self.kind {
1045-
Wild | Never | Lit(_) | Range(..) | Binding(.., None) | Path(_) => {}
1045+
Wild | Never | Lit(_) | Range(..) | Binding(.., None) | Path(_) | Err(_) => {}
10461046
Box(s) | Ref(s, _) | Binding(.., Some(s)) => s.walk_(it),
10471047
Struct(_, fields, _) => fields.iter().for_each(|field| field.pat.walk_(it)),
10481048
TupleStruct(_, s, _) | Tuple(s, _) | Or(s) => s.iter().for_each(|p| p.walk_(it)),
@@ -1205,6 +1205,9 @@ pub enum PatKind<'hir> {
12051205
/// PatKind::Slice([Binding(a), Binding(b)], Some(Wild), [Binding(c), Binding(d)])
12061206
/// ```
12071207
Slice(&'hir [Pat<'hir>], Option<&'hir Pat<'hir>>, &'hir [Pat<'hir>]),
1208+
1209+
/// A placeholder for a pattern that wasn't well formed in some way.
1210+
Err(ErrorGuaranteed),
12081211
}
12091212

12101213
/// A statement.

‎compiler/rustc_hir/src/intravisit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -655,7 +655,7 @@ pub fn walk_pat<'v, V: Visitor<'v>>(visitor: &mut V, pattern: &'v Pat<'v>) {
655655
walk_list!(visitor, visit_expr, lower_bound);
656656
walk_list!(visitor, visit_expr, upper_bound);
657657
}
658-
PatKind::Never | PatKind::Wild => (),
658+
PatKind::Never | PatKind::Wild | PatKind::Err(_) => (),
659659
PatKind::Slice(prepatterns, ref slice_pattern, postpatterns) => {
660660
walk_list!(visitor, visit_pat, prepatterns);
661661
walk_list!(visitor, visit_pat, slice_pattern);

‎compiler/rustc_hir_analysis/src/check/region.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,8 @@ fn resolve_local<'tcx>(
681681
| PatKind::Never
682682
| PatKind::Path(_)
683683
| PatKind::Lit(_)
684-
| PatKind::Range(_, _, _) => false,
684+
| PatKind::Range(_, _, _)
685+
| PatKind::Err(_) => false,
685686
}
686687
}
687688

‎compiler/rustc_hir_pretty/src/lib.rs

+5
Original file line numberDiff line numberDiff line change
@@ -1838,6 +1838,11 @@ impl<'a> State<'a> {
18381838
self.commasep(Inconsistent, after, |s, p| s.print_pat(p));
18391839
self.word("]");
18401840
}
1841+
PatKind::Err(_) => {
1842+
self.popen();
1843+
self.word("/*ERROR*/");
1844+
self.pclose();
1845+
}
18411846
}
18421847
self.ann.post(self, AnnNode::Pat(pat))
18431848
}

‎compiler/rustc_hir_typeck/src/expr_use_visitor.rs

+7-3
Original file line numberDiff line numberDiff line change
@@ -458,11 +458,15 @@ impl<'a, 'tcx> ExprUseVisitor<'a, 'tcx> {
458458
needs_to_be_read = true;
459459
}
460460
}
461-
PatKind::Or(_) | PatKind::Box(_) | PatKind::Ref(..) | PatKind::Wild => {
461+
PatKind::Or(_)
462+
| PatKind::Box(_)
463+
| PatKind::Ref(..)
464+
| PatKind::Wild
465+
| PatKind::Err(_) => {
462466
// If the PatKind is Or, Box, or Ref, the decision is made later
463467
// as these patterns contains subpatterns
464-
// If the PatKind is Wild, the decision is made based on the other patterns being
465-
// examined
468+
// If the PatKind is Wild or Err, the decision is made based on the other patterns
469+
// being examined
466470
}
467471
}
468472
})?

‎compiler/rustc_hir_typeck/src/mem_categorization.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -767,7 +767,8 @@ impl<'a, 'tcx> MemCategorizationContext<'a, 'tcx> {
767767
| PatKind::Lit(..)
768768
| PatKind::Range(..)
769769
| PatKind::Never
770-
| PatKind::Wild => {
770+
| PatKind::Wild
771+
| PatKind::Err(_) => {
771772
// always ok
772773
}
773774
}

‎compiler/rustc_hir_typeck/src/pat.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
177177
PatInfo { binding_mode: def_bm, top_info: ti, decl_origin: pat_info.decl_origin };
178178

179179
let ty = match pat.kind {
180-
PatKind::Wild => expected,
180+
PatKind::Wild | PatKind::Err(_) => expected,
181181
// FIXME(never_patterns): check the type is uninhabited. If that is not possible within
182182
// typeck, do that in a later phase.
183183
PatKind::Never => expected,
@@ -325,6 +325,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
325325
PatKind::Ref(..) => AdjustMode::Reset,
326326
// A `_` pattern works with any expected type, so there's no need to do anything.
327327
PatKind::Wild
328+
// A malformed pattern doesn't have an expected type, so let's just accept any type.
329+
| PatKind::Err(_)
328330
// Bindings also work with whatever the expected type is,
329331
// and moreover if we peel references off, that will give us the wrong binding type.
330332
// Also, we can have a subpattern `binding @ pat`.
@@ -754,7 +756,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
754756
| PatKind::Box(..)
755757
| PatKind::Ref(..)
756758
| PatKind::Lit(..)
757-
| PatKind::Range(..) => break 'block None,
759+
| PatKind::Range(..)
760+
| PatKind::Err(_) => break 'block None,
758761
},
759762

760763
// Don't provide suggestions in other cases

‎compiler/rustc_lint/src/unused.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ impl EarlyLintPass for UnusedParens {
11661166
// Do not lint on `(..)` as that will result in the other arms being useless.
11671167
Paren(_)
11681168
// The other cases do not contain sub-patterns.
1169-
| Wild | Never | Rest | Lit(..) | MacCall(..) | Range(..) | Ident(.., None) | Path(..) => {},
1169+
| Wild | Never | Rest | Lit(..) | MacCall(..) | Range(..) | Ident(.., None) | Path(..) | Err(_) => {},
11701170
// These are list-like patterns; parens can always be removed.
11711171
TupleStruct(_, _, ps) | Tuple(ps) | Slice(ps) | Or(ps) => for p in ps {
11721172
self.check_unused_parens_pat(cx, p, false, false, keep_space);

‎compiler/rustc_mir_build/src/thir/pattern/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,8 @@ impl<'a, 'tcx> PatCtxt<'a, 'tcx> {
345345
}
346346

347347
hir::PatKind::Or(pats) => PatKind::Or { pats: self.lower_patterns(pats) },
348+
349+
hir::PatKind::Err(guar) => PatKind::Error(guar),
348350
};
349351

350352
Box::new(Pat { span, ty, kind })

‎compiler/rustc_passes/src/hir_stats.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,8 @@ impl<'v> hir_visit::Visitor<'v> for StatCollector<'v> {
303303
Ref,
304304
Lit,
305305
Range,
306-
Slice
306+
Slice,
307+
Err
307308
]
308309
);
309310
hir_visit::walk_pat(self, p)
@@ -576,7 +577,8 @@ impl<'v> ast_visit::Visitor<'v> for StatCollector<'v> {
576577
Rest,
577578
Never,
578579
Paren,
579-
MacCall
580+
MacCall,
581+
Err
580582
]
581583
);
582584
ast_visit::walk_pat(self, p)

‎src/librustdoc/clean/utils.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,9 @@ pub(crate) fn name_from_pat(p: &hir::Pat<'_>) -> Symbol {
312312

313313
Symbol::intern(&match p.kind {
314314
// FIXME(never_patterns): does this make sense?
315-
PatKind::Wild | PatKind::Never | PatKind::Struct(..) => return kw::Underscore,
315+
PatKind::Wild | PatKind::Err(_) | PatKind::Never | PatKind::Struct(..) => {
316+
return kw::Underscore;
317+
}
316318
PatKind::Binding(_, _, ident, _) => return ident.name,
317319
PatKind::TupleStruct(ref p, ..) | PatKind::Path(ref p) => qpath_to_string(p),
318320
PatKind::Or(pats) => {

‎src/tools/clippy/clippy_lints/src/equatable_if_let.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ fn unary_pattern(pat: &Pat<'_>) -> bool {
5151
| PatKind::Binding(..)
5252
| PatKind::Wild
5353
| PatKind::Never
54-
| PatKind::Or(_) => false,
54+
| PatKind::Or(_)
55+
| PatKind::Err(_) => false,
5556
PatKind::Struct(_, a, etc) => !etc && a.iter().all(|x| unary_pattern(x.pat)),
5657
PatKind::Tuple(a, etc) | PatKind::TupleStruct(_, a, etc) => etc.as_opt_usize().is_none() && array_rec(a),
5758
PatKind::Ref(x, _) | PatKind::Box(x) => unary_pattern(x),

‎src/tools/clippy/clippy_lints/src/matches/match_same_arms.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ use rustc_hir::{Arm, Expr, ExprKind, HirId, HirIdMap, HirIdMapEntry, HirIdSet, P
1111
use rustc_lint::builtin::NON_EXHAUSTIVE_OMITTED_PATTERNS;
1212
use rustc_lint::LateContext;
1313
use rustc_middle::ty;
14-
use rustc_span::Symbol;
14+
use rustc_span::{ErrorGuaranteed, Symbol};
1515

1616
use super::MATCH_SAME_ARMS;
1717

@@ -167,6 +167,8 @@ enum NormalizedPat<'a> {
167167
/// contains everything afterwards. Note that either side, or both sides, may contain zero
168168
/// patterns.
169169
Slice(&'a [Self], Option<&'a [Self]>),
170+
/// A placeholder for a pattern that wasn't well formed in some way.
171+
Err(ErrorGuaranteed),
170172
}
171173

172174
#[derive(Clone, Copy)]
@@ -329,6 +331,7 @@ impl<'a> NormalizedPat<'a> {
329331
arena.alloc_from_iter(front.iter().map(|pat| Self::from_pat(cx, arena, pat))),
330332
wild_pat.map(|_| &*arena.alloc_from_iter(back.iter().map(|pat| Self::from_pat(cx, arena, pat)))),
331333
),
334+
PatKind::Err(guar) => Self::Err(guar),
332335
}
333336
}
334337

‎src/tools/clippy/clippy_lints/src/unnested_or_patterns.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ fn transform_with_focus_on_idx(alternatives: &mut ThinVec<P<Pat>>, focus_idx: us
226226
// Therefore they are not some form of constructor `C`,
227227
// with which a pattern `C(p_0)` may be formed,
228228
// which we would want to join with other `C(p_j)`s.
229-
Ident(.., None) | Lit(_) | Wild | Never | Path(..) | Range(..) | Rest | MacCall(_)
229+
Ident(.., None) | Lit(_) | Wild | Err(_) | Never | Path(..) | Range(..) | Rest | MacCall(_)
230230
// Skip immutable refs, as grouping them saves few characters,
231231
// and almost always requires adding parens (increasing noisiness).
232232
// In the case of only two patterns, replacement adds net characters.

‎src/tools/clippy/clippy_lints/src/utils/author.rs

+1
Original file line numberDiff line numberDiff line change
@@ -710,6 +710,7 @@ impl<'a, 'tcx> PrintVisitor<'a, 'tcx> {
710710
self.slice(start, |pat| self.pat(pat));
711711
self.slice(end, |pat| self.pat(pat));
712712
},
713+
PatKind::Err(_) => kind!("Err"),
713714
}
714715
}
715716

‎src/tools/clippy/clippy_utils/src/hir_utils.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ impl<'a, 'tcx> SpanlessHash<'a, 'tcx> {
10071007
}
10081008
e.hash(&mut self.s);
10091009
},
1010-
PatKind::Never | PatKind::Wild => {},
1010+
PatKind::Never | PatKind::Wild | PatKind::Err(_) => {},
10111011
}
10121012
}
10131013

‎src/tools/clippy/clippy_utils/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1733,6 +1733,7 @@ pub fn is_refutable(cx: &LateContext<'_>, pat: &Pat<'_>) -> bool {
17331733
},
17341734
}
17351735
},
1736+
PatKind::Err(_) => true,
17361737
}
17371738
}
17381739

‎src/tools/rustfmt/src/patterns.rs

+6-3
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@ pub(crate) fn is_short_pattern(pat: &ast::Pat, pat_str: &str) -> bool {
4040

4141
fn is_short_pattern_inner(pat: &ast::Pat) -> bool {
4242
match pat.kind {
43-
ast::PatKind::Rest | ast::PatKind::Never | ast::PatKind::Wild | ast::PatKind::Lit(_) => {
44-
true
45-
}
43+
ast::PatKind::Rest
44+
| ast::PatKind::Never
45+
| ast::PatKind::Wild
46+
| ast::PatKind::Err(_)
47+
| ast::PatKind::Lit(_) => true,
4648
ast::PatKind::Ident(_, _, ref pat) => pat.is_none(),
4749
ast::PatKind::Struct(..)
4850
| ast::PatKind::MacCall(..)
@@ -274,6 +276,7 @@ impl Rewrite for Pat {
274276
PatKind::Paren(ref pat) => pat
275277
.rewrite(context, shape.offset_left(1)?.sub_width(1)?)
276278
.map(|inner_pat| format!("({})", inner_pat)),
279+
PatKind::Err(_) => None,
277280
}
278281
}
279282
}

0 commit comments

Comments
 (0)