diff options
| author | Jonathan Turner <jonathandturner@users.noreply.github.com> | 2016-08-20 07:09:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-20 07:09:36 -0700 |
| commit | f17ff3aa9370d38c6cfa7f1f118d70f856fc85e2 (patch) | |
| tree | 7eed690903c1fca1637d091e73b016784a0a0d1e | |
| parent | b9c0a8cd8ec966b05030197e540050d07ebf1021 (diff) | |
| parent | 2128d31a41346c726d2271845d92533ccae882e7 (diff) | |
| download | rust-f17ff3aa9370d38c6cfa7f1f118d70f856fc85e2.tar.gz rust-f17ff3aa9370d38c6cfa7f1f118d70f856fc85e2.zip | |
Rollup merge of #35818 - wdv4758h:E0133-label, r=Aatch
Fix label messages for E0133 Issue #35789
| -rw-r--r-- | src/librustc/middle/effect.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/E0133.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-28776.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/trait-safety-fn-body.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/unsafe-const-fn.rs | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 3ca6cf03997..250ad80f5af 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -66,7 +66,7 @@ impl<'a, 'tcx> EffectCheckVisitor<'a, 'tcx> { struct_span_err!( self.tcx.sess, span, E0133, "{} requires unsafe function or block", description) - .span_label(span, &format!("unsafe call requires unsafe function or block")) + .span_label(span, &description) .emit(); } UnsafeBlock(block_id) => { diff --git a/src/test/compile-fail/E0133.rs b/src/test/compile-fail/E0133.rs index b8a4476fc59..f60d9a5083f 100644 --- a/src/test/compile-fail/E0133.rs +++ b/src/test/compile-fail/E0133.rs @@ -13,5 +13,5 @@ unsafe fn f() { return; } fn main() { f(); //~^ ERROR E0133 - //~| NOTE unsafe call requires unsafe function or block + //~| NOTE call to unsafe function } diff --git a/src/test/compile-fail/issue-28776.rs b/src/test/compile-fail/issue-28776.rs index 52b0eba96cb..4a36bc88fa7 100644 --- a/src/test/compile-fail/issue-28776.rs +++ b/src/test/compile-fail/issue-28776.rs @@ -13,5 +13,5 @@ use std::ptr; fn main() { (&ptr::write)(1 as *mut _, 42); //~^ ERROR E0133 - //~| NOTE unsafe call requires unsafe function or block + //~| NOTE call to unsafe function } diff --git a/src/test/compile-fail/trait-safety-fn-body.rs b/src/test/compile-fail/trait-safety-fn-body.rs index 0df7ee8cabe..65732a8ff69 100644 --- a/src/test/compile-fail/trait-safety-fn-body.rs +++ b/src/test/compile-fail/trait-safety-fn-body.rs @@ -20,7 +20,7 @@ unsafe impl UnsafeTrait for *mut isize { // Unsafe actions are not made legal by taking place in an unsafe trait: *self += 1; //~^ ERROR E0133 - //~| NOTE unsafe call requires unsafe function or block + //~| NOTE dereference of raw pointer } } diff --git a/src/test/compile-fail/unsafe-const-fn.rs b/src/test/compile-fail/unsafe-const-fn.rs index 174939b0900..91e16592be4 100644 --- a/src/test/compile-fail/unsafe-const-fn.rs +++ b/src/test/compile-fail/unsafe-const-fn.rs @@ -18,7 +18,7 @@ const unsafe fn dummy(v: u32) -> u32 { const VAL: u32 = dummy(0xFFFF); //~^ ERROR E0133 -//~| NOTE unsafe call requires unsafe function or block +//~| NOTE call to unsafe function fn main() { assert_eq!(VAL, 0xFFFF0000); |