bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Remove redundant field.

Browse source
This commit is contained in:
Camille GILLOT 2023-03-01 21:40:56 +00:00
parent 4f97540432
commit e73aeeaeee
2 changed files with 4 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_mir_build/src/errors.rs
View file

@ -576,7 +576,6 @@ pub struct IrrefutableLetPatternsWhileLet {
#[diag(mir_build_borrow_of_moved_value)] #[diag(mir_build_borrow_of_moved_value)]
pub struct BorrowOfMovedValue<'tcx> { pub struct BorrowOfMovedValue<'tcx> {
#[primary_span] #[primary_span]
pub span: Span,
#[label] #[label]
#[label(mir_build_occurs_because_label)] #[label(mir_build_occurs_because_label)]
pub binding_span: Span, pub binding_span: Span,

13
compiler/rustc_mir_build/src/thir/pattern/check_match.rs
View file

@ -900,7 +900,6 @@ fn maybe_point_at_variant<'a, 'p: 'a, 'tcx: 'a>(
fn check_borrow_conflicts_in_at_patterns<'tcx>(cx: &MatchVisitor<'_, '_, 'tcx>, pat: &Pat<'tcx>) { fn check_borrow_conflicts_in_at_patterns<'tcx>(cx: &MatchVisitor<'_, '_, 'tcx>, pat: &Pat<'tcx>) {
// Extract `sub` in `binding @ sub`. // Extract `sub` in `binding @ sub`.
let PatKind::Binding { name, mode, ty, subpattern: Some(box ref sub), .. } = pat.kind else { return }; let PatKind::Binding { name, mode, ty, subpattern: Some(box ref sub), .. } = pat.kind else { return };
let binding_span = pat.span; //.with_hi(name.span.hi());
let is_binding_by_move = |ty: Ty<'tcx>| !ty.is_copy_modulo_regions(cx.tcx, cx.param_env); let is_binding_by_move = |ty: Ty<'tcx>| !ty.is_copy_modulo_regions(cx.tcx, cx.param_env);
@ -917,15 +916,11 @@ fn check_borrow_conflicts_in_at_patterns<'tcx>(cx: &MatchVisitor<'_, '_, 'tcx>,
}); });
if !conflicts_ref.is_empty() { if !conflicts_ref.is_empty() {
sess.emit_err(BorrowOfMovedValue { sess.emit_err(BorrowOfMovedValue {
span: pat.span, binding_span: pat.span,
binding_span,
conflicts_ref, conflicts_ref,
name, name,
ty, ty,
suggest_borrowing: pat suggest_borrowing: Some(pat.span.shrink_to_lo()),
.span
.contains(binding_span)
.then(|| binding_span.shrink_to_lo()),
}); });
} }
return; return;
@ -967,8 +962,8 @@ fn check_borrow_conflicts_in_at_patterns<'tcx>(cx: &MatchVisitor<'_, '_, 'tcx>,
let report_move_conflict = !conflicts_move.is_empty(); let report_move_conflict = !conflicts_move.is_empty();
let mut occurences = match mut_outer { let mut occurences = match mut_outer {
Mutability::Mut => vec![Conflict::Mut { span: binding_span, name }], Mutability::Mut => vec![Conflict::Mut { span: pat.span, name }],
Mutability::Not => vec![Conflict::Ref { span: binding_span, name }], Mutability::Not => vec![Conflict::Ref { span: pat.span, name }],
}; };
occurences.extend(conflicts_mut_mut); occurences.extend(conflicts_mut_mut);
occurences.extend(conflicts_mut_ref); occurences.extend(conflicts_mut_ref);