diff options
| author | Jonathan Turner <jonathandturner@users.noreply.github.com> | 2016-08-11 06:34:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 06:34:01 -0700 |
| commit | efbed8ba794189435c570a20c673235a957d0ff7 (patch) | |
| tree | ec7c2b76ea3d1890b36665acd82e2fa0bbfe97c3 | |
| parent | 6692f41e129f9697ba4c2c4b6fee333c189363f4 (diff) | |
| parent | e7065b7f92c777b70065b51f930fa494600cd275 (diff) | |
| download | rust-efbed8ba794189435c570a20c673235a957d0ff7.tar.gz rust-efbed8ba794189435c570a20c673235a957d0ff7.zip | |
Rollup merge of #35565 - wdv4758h:E0133, r=jonathandturner
Update E0133 to new format Part of #35233 Fix #35509 r? @jonathandturner
| -rw-r--r-- | src/librustc/middle/effect.rs | 8 | ||||
| -rw-r--r-- | src/test/compile-fail/E0133.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/issue-28776.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/trait-safety-fn-body.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/unsafe-const-fn.rs | 4 |
5 files changed, 17 insertions, 7 deletions
diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 446767ecbca..3ca6cf03997 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -63,9 +63,11 @@ impl<'a, 'tcx> EffectCheckVisitor<'a, 'tcx> { match self.unsafe_context.root { SafeContext => { // Report an error. - span_err!(self.tcx.sess, span, E0133, - "{} requires unsafe function or block", - description); + 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")) + .emit(); } UnsafeBlock(block_id) => { // OK, but record this. diff --git a/src/test/compile-fail/E0133.rs b/src/test/compile-fail/E0133.rs index 630ee851d0a..b8a4476fc59 100644 --- a/src/test/compile-fail/E0133.rs +++ b/src/test/compile-fail/E0133.rs @@ -11,5 +11,7 @@ unsafe fn f() { return; } fn main() { - f(); //~ ERROR E0133 + f(); + //~^ ERROR E0133 + //~| NOTE unsafe call requires unsafe function or block } diff --git a/src/test/compile-fail/issue-28776.rs b/src/test/compile-fail/issue-28776.rs index ce06c8bf220..52b0eba96cb 100644 --- a/src/test/compile-fail/issue-28776.rs +++ b/src/test/compile-fail/issue-28776.rs @@ -11,5 +11,7 @@ use std::ptr; fn main() { - (&ptr::write)(1 as *mut _, 42); //~ ERROR E0133 + (&ptr::write)(1 as *mut _, 42); + //~^ ERROR E0133 + //~| NOTE unsafe call requires unsafe function or block } diff --git a/src/test/compile-fail/trait-safety-fn-body.rs b/src/test/compile-fail/trait-safety-fn-body.rs index 499b58f70d7..0df7ee8cabe 100644 --- a/src/test/compile-fail/trait-safety-fn-body.rs +++ b/src/test/compile-fail/trait-safety-fn-body.rs @@ -18,7 +18,9 @@ unsafe trait UnsafeTrait : Sized { unsafe impl UnsafeTrait for *mut isize { fn foo(self) { // Unsafe actions are not made legal by taking place in an unsafe trait: - *self += 1; //~ ERROR E0133 + *self += 1; + //~^ ERROR E0133 + //~| NOTE unsafe call requires unsafe function or block } } diff --git a/src/test/compile-fail/unsafe-const-fn.rs b/src/test/compile-fail/unsafe-const-fn.rs index 24ac41ce884..174939b0900 100644 --- a/src/test/compile-fail/unsafe-const-fn.rs +++ b/src/test/compile-fail/unsafe-const-fn.rs @@ -16,7 +16,9 @@ const unsafe fn dummy(v: u32) -> u32 { !v } -const VAL: u32 = dummy(0xFFFF); //~ ERROR E0133 +const VAL: u32 = dummy(0xFFFF); +//~^ ERROR E0133 +//~| NOTE unsafe call requires unsafe function or block fn main() { assert_eq!(VAL, 0xFFFF0000); |