is_binding_pat: treat or-pat like tuple-pat

rust-lang · Dec 19, 2019 · 4414f0d · 4414f0d
1 parent ffbde9f
commit 4414f0d
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/librustc/middle/region.rs b/src/librustc/middle/region.rs
@@ -1173,6 +1173,7 @@ fn resolve_local<'tcx>(
  /// | VariantName(..., P&, ...)
  /// | [ ..., P&, ... ]
  /// | ( ..., P&, ... )
+ /// | ... "|" P& "|" ...
  /// | box P&
  fn is_binding_pat(pat: &hir::Pat) -> bool {
  // Note that the code below looks for *explicit* refs only, that is, it won't
@@ -1212,6 +1213,7 @@ fn resolve_local<'tcx>(
  pats3.iter().any(|p| is_binding_pat(&p))
  }
 
+ PatKind::Or(ref subpats) |
  PatKind::TupleStruct(_, ref subpats, _) |
  PatKind::Tuple(ref subpats, _) => {
  subpats.iter().any(|p| is_binding_pat(&p))
@@ -1221,7 +1223,6 @@ fn resolve_local<'tcx>(
  is_binding_pat(&subpat)
  }
 
- PatKind::Or(_) |
  PatKind::Ref(_, _) |
  PatKind::Binding(hir::BindingAnnotation::Unannotated, ..) |
  PatKind::Binding(hir::BindingAnnotation::Mutable, ..) |