move_ref_pattern: don't ICE on unreachable 2xby-move conflicts
This commit is contained in:
parent
0253f868ca
commit
8d4973f587
2 changed files with 15 additions and 3 deletions
|
@ -648,9 +648,6 @@ fn check_borrow_conflicts_in_at_patterns(cx: &MatchVisitor<'_, '_>, pat: &Pat<'_
|
||||||
let mut conflicts_ref = Vec::new();
|
let mut conflicts_ref = Vec::new();
|
||||||
sub.each_binding(|_, hir_id, span, _| {
|
sub.each_binding(|_, hir_id, span, _| {
|
||||||
match tables.extract_binding_mode(sess, hir_id, span) {
|
match tables.extract_binding_mode(sess, hir_id, span) {
|
||||||
Some(ty::BindByValue(_)) if is_binding_by_move(cx, hir_id, span) => {
|
|
||||||
sess.delay_span_bug(span, "by-move in subpat unchecked by borrowck");
|
|
||||||
}
|
|
||||||
Some(ty::BindByValue(_)) | None => {}
|
Some(ty::BindByValue(_)) | None => {}
|
||||||
Some(ty::BindByReference(_)) => conflicts_ref.push(span),
|
Some(ty::BindByReference(_)) => conflicts_ref.push(span),
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
// When conflicts between by-move bindings in `by_move_1 @ has_by_move` patterns
|
||||||
|
// happen and that code is unreachable according to borrowck, we accept this code.
|
||||||
|
// In particular, we want to ensure here that an ICE does not happen, which it did originally.
|
||||||
|
|
||||||
|
// check-pass
|
||||||
|
|
||||||
|
#![feature(move_ref_pattern)]
|
||||||
|
#![feature(bindings_after_at)]
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
return;
|
||||||
|
|
||||||
|
struct S;
|
||||||
|
let a @ (b, c) = (S, S);
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue