From 0dc13ee7f23f878e626771c1a3925b37b19fd6e4 Mon Sep 17 00:00:00 2001
From: clementmiao <clementmiao@gmail.com>
Date: Wed, 17 Aug 2016 22:03:52 -0700
Subject: [PATCH 1/2] updated E0395 to new error format
---
src/librustc_mir/transform/qualify_consts.rs | 11 ++++++++---
src/test/compile-fail/E0395.rs | 2 +-
src/test/compile-fail/issue-25826.rs | 1 +
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index 103a15dadb61c..a9ef702ee0548 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -678,9 +678,14 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> {
self.add(Qualif::NOT_CONST);
if self.mode != Mode::Fn {
- span_err!(self.tcx.sess, self.span, E0395,
- "raw pointers cannot be compared in {}s",
- self.mode);
+ struct_span_err!(
+ self.tcx.sess, self.span, E0395,
+ "raw pointers cannot be compared in {}s",
+ self.mode)
+ .span_label(
+ self.span,
+ &format!("comparing raw pointers in static"))
+ .emit();
}
}
}
diff --git a/src/test/compile-fail/E0395.rs b/src/test/compile-fail/E0395.rs
index 6ab66313a0472..98f08cd68c22d 100644
--- a/src/test/compile-fail/E0395.rs
+++ b/src/test/compile-fail/E0395.rs
@@ -12,6 +12,6 @@ static FOO: i32 = 42;
static BAR: i32 = 42;
static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR E0395
-
+ //~| NOTE comparing raw pointers in static
fn main() {
}
diff --git a/src/test/compile-fail/issue-25826.rs b/src/test/compile-fail/issue-25826.rs
index 00e1279d58a0e..468282fa7cca9 100644
--- a/src/test/compile-fail/issue-25826.rs
+++ b/src/test/compile-fail/issue-25826.rs
@@ -12,5 +12,6 @@ fn id<T>(t: T) -> T { t }
fn main() {
const A: bool = id::<u8> as *const () < id::<u16> as *const ();
//~^ ERROR raw pointers cannot be compared in constants [E0395]
+ //~^^ NOTE comparing raw pointers in static
println!("{}", A);
}
From 2f5d537da4d21f66e7c50295c43350a339e492a3 Mon Sep 17 00:00:00 2001
From: clementmiao <clementmiao@gmail.com>
Date: Wed, 17 Aug 2016 22:24:35 -0700
Subject: [PATCH 2/2] update E0396 to new error format
---
src/librustc_mir/transform/qualify_consts.rs | 11 ++++++++---
src/test/compile-fail/E0396.rs | 1 +
src/test/compile-fail/const-deref-ptr.rs | 1 +
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/librustc_mir/transform/qualify_consts.rs b/src/librustc_mir/transform/qualify_consts.rs
index a9ef702ee0548..2006b267412d7 100644
--- a/src/librustc_mir/transform/qualify_consts.rs
+++ b/src/librustc_mir/transform/qualify_consts.rs
@@ -490,9 +490,14 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> {
if let ty::TyRawPtr(_) = base_ty.sty {
this.add(Qualif::NOT_CONST);
if this.mode != Mode::Fn {
- span_err!(this.tcx.sess, this.span, E0396,
- "raw pointers cannot be dereferenced in {}s",
- this.mode);
+ struct_span_err!(this.tcx.sess,
+ this.span, E0396,
+ "raw pointers cannot be dereferenced in {}s",
+ this.mode)
+ .span_label(
+ this.span,
+ &format!("dereference of raw pointer in constant"))
+ .emit();
}
}
}
diff --git a/src/test/compile-fail/E0396.rs b/src/test/compile-fail/E0396.rs
index 7f34acdfb9007..47080fb6e9ef7 100644
--- a/src/test/compile-fail/E0396.rs
+++ b/src/test/compile-fail/E0396.rs
@@ -11,6 +11,7 @@
const REG_ADDR: *const u8 = 0x5f3759df as *const u8;
const VALUE: u8 = unsafe { *REG_ADDR }; //~ ERROR E0396
+ //~| NOTE dereference of raw pointer in constant
fn main() {
}
diff --git a/src/test/compile-fail/const-deref-ptr.rs b/src/test/compile-fail/const-deref-ptr.rs
index fa15f3e87c694..c626801d48c03 100644
--- a/src/test/compile-fail/const-deref-ptr.rs
+++ b/src/test/compile-fail/const-deref-ptr.rs
@@ -12,5 +12,6 @@
fn main() {
static C: u64 = unsafe {*(0xdeadbeef as *const u64)}; //~ ERROR E0396
+ //~| NOTE dereference of raw pointer in constant
println!("{}", C);
}