about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-16 08:31:59 +0000
committerbors <bors@rust-lang.org>2017-11-16 08:31:59 +0000
commitedd9dbcdbbc022c3eb74fcf7800eb6781c3b3e76 (patch)
treeacc9c18757be25ee469676b77fe7df726629efe6 /src/test
parent1410d5604042b739f02f9ec0f2a6c5125c797d52 (diff)
parentc0f7cce96e1bf2122ce00afb735a9feb493638ca (diff)
Auto merge of #45985 - arielb1:unsafe-dedup, r=eddyb
check_unsafety: fix unused unsafe block duplication

The duplicate error message is later removed by error message
deduplication, but it still appears on beta and is still a bug.

r? @eddyb
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr b/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr
index 5c58b19c7fb..be6b1e30a59 100644
--- a/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr
+++ b/src/test/ui/issue-45107-unnecessary-unsafe-in-closure.stderr
@@ -36,15 +36,16 @@ error: unnecessary `unsafe` block
    | |_________________^ unnecessary `unsafe` block
    |
 note: because it's nested under this `unsafe` block
-  --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:17:13
+  --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:15:5
    |
-17 | /             unsafe {
+15 | /     unsafe {
+16 | |         let f = |v: &mut Vec<_>| {
+17 | |             unsafe {
 18 | |                 v.set_len(24);
-19 | |                 |w: &mut Vec<u32>| { unsafe {
-20 | |                     w.set_len(32);
-21 | |                 } };
-22 | |             }
-   | |_____________^
+...  |
+29 | |         f(&mut v);
+30 | |     }
+   | |_____^
 
 error: unnecessary `unsafe` block
   --> $DIR/issue-45107-unnecessary-unsafe-in-closure.rs:23:34
@@ -67,5 +68,5 @@ note: because it's nested under this `unsafe` block
 30 | |     }
    | |_____^
 
-error: aborting due to 6 previous errors
+error: aborting due to 3 previous errors