about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/const-eval-overflow-4b.rs18
-rw-r--r--src/test/run-pass/const-err.rs2
2 files changed, 12 insertions, 8 deletions
diff --git a/src/test/compile-fail/const-eval-overflow-4b.rs b/src/test/compile-fail/const-eval-overflow-4b.rs
index 5aa93cf6383..31e1a72967f 100644
--- a/src/test/compile-fail/const-eval-overflow-4b.rs
+++ b/src/test/compile-fail/const-eval-overflow-4b.rs
@@ -15,7 +15,6 @@
 
 #![allow(unused_imports)]
 
-use std::fmt;
 use std::{i8, i16, i32, i64, isize};
 use std::{u8, u16, u32, u64, usize};
 
@@ -26,10 +25,15 @@ const A_I8_T
     //~| found `u8` [E0250]
     = [0; (i8::MAX as usize) + 1];
 
-fn main() {
-    foo(&A_I8_T[..]);
-}
 
-fn foo<T:fmt::Debug>(x: T) {
-    println!("{:?}", x);
-}
+const A_CHAR_USIZE
+    : [u32; 5u8 as char as usize]
+    = [0; 5];
+
+
+const A_BAD_CHAR_USIZE
+    : [u32; 5i8 as char as usize]
+    //~^ ERROR only `u8` can be cast as `char`, not `i8`
+    = [0; 5];
+
+fn main() {}
diff --git a/src/test/run-pass/const-err.rs b/src/test/run-pass/const-err.rs
index 8d7ac4f54c1..30641c1cb87 100644
--- a/src/test/run-pass/const-err.rs
+++ b/src/test/run-pass/const-err.rs
@@ -1,4 +1,4 @@
-// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //