Skip to content

Commit 0dc13ee

Browse files
committed
updated E0395 to new error format
1 parent 9376da6 commit 0dc13ee

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/librustc_mir/transform/qualify_consts.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -678,9 +678,14 @@ impl<'a, 'tcx> Visitor<'tcx> for Qualifier<'a, 'tcx, 'tcx> {
678678

679679
self.add(Qualif::NOT_CONST);
680680
if self.mode != Mode::Fn {
681-
span_err!(self.tcx.sess, self.span, E0395,
682-
"raw pointers cannot be compared in {}s",
683-
self.mode);
681+
struct_span_err!(
682+
self.tcx.sess, self.span, E0395,
683+
"raw pointers cannot be compared in {}s",
684+
self.mode)
685+
.span_label(
686+
self.span,
687+
&format!("comparing raw pointers in static"))
688+
.emit();
684689
}
685690
}
686691
}

src/test/compile-fail/E0395.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ static FOO: i32 = 42;
1212
static BAR: i32 = 42;
1313

1414
static BAZ: bool = { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR E0395
15-
15+
//~| NOTE comparing raw pointers in static
1616
fn main() {
1717
}

src/test/compile-fail/issue-25826.rs

+1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ fn id<T>(t: T) -> T { t }
1212
fn main() {
1313
const A: bool = id::<u8> as *const () < id::<u16> as *const ();
1414
//~^ ERROR raw pointers cannot be compared in constants [E0395]
15+
//~^^ NOTE comparing raw pointers in static
1516
println!("{}", A);
1617
}

0 commit comments

Comments
 (0)