about summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-05-06 12:32:44 +0000
committerbors <bors@rust-lang.org>2022-05-06 12:32:44 +0000
commit9a251644fa2adde5f46eea8d342b7e60e4716039 (patch)
tree7017ac2f53456a2a7df4338f7a5186ead387f3e0 /src/test/ui/error-codes
parent8c4fc9d9a45b0577f583abda870386f1f940c706 (diff)
parent2300401fb0a44966a2159dd0a69762b18fd89345 (diff)
downloadrust-9a251644fa2adde5f46eea8d342b7e60e4716039.tar.gz
rust-9a251644fa2adde5f46eea8d342b7e60e4716039.zip
Auto merge of #96268 - jackh726:remove-mutable_borrow_reservation_conflict-lint, r=nikomatsakis
Remove mutable_borrow_reservation_conflict lint and allow the code pattern

This was the only breaking issue with the NLL stabilization PR. Lang team decided to go ahead and allow this.

r? `@nikomatsakis`
Closes #59159
Closes #56254
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0502.nll.stderr4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/error-codes/E0502.nll.stderr b/src/test/ui/error-codes/E0502.nll.stderr
index a3c7ef76189..94cc89754db 100644
--- a/src/test/ui/error-codes/E0502.nll.stderr
+++ b/src/test/ui/error-codes/E0502.nll.stderr
@@ -1,10 +1,10 @@
 error[E0502]: cannot borrow `*a` as mutable because it is also borrowed as immutable
-  --> $DIR/E0502.rs:4:9
+  --> $DIR/E0502.rs:4:5
    |
 LL |     let ref y = a;
    |         ----- immutable borrow occurs here
 LL |     bar(a);
-   |         ^ mutable borrow occurs here
+   |     ^^^^^^ mutable borrow occurs here
 LL |     y.use_ref();
    |     ----------- immutable borrow later used here