diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2015-06-17 10:12:18 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2015-07-03 19:42:35 -0400 |
| commit | 18e9007ac249c542aa3b73b5aa275e52825ca940 (patch) | |
| tree | 770637a728b28b6f54c402faef500083001aebf3 | |
| parent | 1e7a6b880c84176a11525e7be5b5a9b15f8143b1 (diff) | |
| download | rust-18e9007ac249c542aa3b73b5aa275e52825ca940.tar.gz rust-18e9007ac249c542aa3b73b5aa275e52825ca940.zip | |
Adjust tests to silence warnings (or record them, as appropriate).
| -rw-r--r-- | src/test/compile-fail/issue-24446.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/object-lifetime-default-elision.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/object-lifetime-default-mybox.rs | 1 | ||||
| -rw-r--r-- | src/test/compile-fail/object-lifetime-default.rs | 4 | ||||
| -rw-r--r-- | src/test/compile-fail/trait-bounds-cant-coerce.rs | 4 | ||||
| -rw-r--r-- | src/test/run-pass/issue-21058.rs | 2 |
6 files changed, 8 insertions, 6 deletions
diff --git a/src/test/compile-fail/issue-24446.rs b/src/test/compile-fail/issue-24446.rs index 7ac73a931f1..1fca8eb6ac4 100644 --- a/src/test/compile-fail/issue-24446.rs +++ b/src/test/compile-fail/issue-24446.rs @@ -11,7 +11,7 @@ fn main() { static foo: Fn() -> u32 = || -> u32 { //~^ ERROR: mismatched types: - //~| expected `core::ops::Fn() -> u32`, + //~| expected `core::ops::Fn() -> u32 + 'static`, //~| found closure //~| (expected trait core::ops::Fn, //~| found closure) diff --git a/src/test/compile-fail/object-lifetime-default-elision.rs b/src/test/compile-fail/object-lifetime-default-elision.rs index 75ee0bdc9c7..371acd24da0 100644 --- a/src/test/compile-fail/object-lifetime-default-elision.rs +++ b/src/test/compile-fail/object-lifetime-default-elision.rs @@ -41,6 +41,7 @@ fn load0<'a>(ss: &'a Box<SomeTrait>) -> Box<SomeTrait> { deref(ss) //~^ ERROR cannot infer + //~| WARNING E0398 } fn load1(ss: &SomeTrait) -> &SomeTrait { diff --git a/src/test/compile-fail/object-lifetime-default-mybox.rs b/src/test/compile-fail/object-lifetime-default-mybox.rs index 23ddea4499a..c8fe197b92c 100644 --- a/src/test/compile-fail/object-lifetime-default-mybox.rs +++ b/src/test/compile-fail/object-lifetime-default-mybox.rs @@ -28,6 +28,7 @@ fn deref<T>(ss: &T) -> T { fn load0(ss: &MyBox<SomeTrait>) -> MyBox<SomeTrait> { deref(ss) //~ ERROR cannot infer + //~^ WARNING E0398 } fn load1<'a,'b>(a: &'a MyBox<SomeTrait>, diff --git a/src/test/compile-fail/object-lifetime-default.rs b/src/test/compile-fail/object-lifetime-default.rs index b71eadd6d08..ff4d5c48745 100644 --- a/src/test/compile-fail/object-lifetime-default.rs +++ b/src/test/compile-fail/object-lifetime-default.rs @@ -11,10 +11,10 @@ #![feature(rustc_attrs)] #[rustc_object_lifetime_default] -struct A<T>(T); //~ ERROR None +struct A<T>(T); //~ ERROR BaseDefault #[rustc_object_lifetime_default] -struct B<'a,T>(&'a (), T); //~ ERROR None +struct B<'a,T>(&'a (), T); //~ ERROR BaseDefault #[rustc_object_lifetime_default] struct C<'a,T:'a>(&'a T); //~ ERROR 'a diff --git a/src/test/compile-fail/trait-bounds-cant-coerce.rs b/src/test/compile-fail/trait-bounds-cant-coerce.rs index 3129dceffbb..836f08d0e78 100644 --- a/src/test/compile-fail/trait-bounds-cant-coerce.rs +++ b/src/test/compile-fail/trait-bounds-cant-coerce.rs @@ -22,8 +22,8 @@ fn c(x: Box<Foo+Sync+Send>) { fn d(x: Box<Foo>) { a(x); //~ ERROR mismatched types - //~| expected `Box<Foo + Send>` - //~| found `Box<Foo>` + //~| expected `Box<Foo + Send + 'static>` + //~| found `Box<Foo + 'static>` //~| expected bounds `Send` //~| found no bounds } diff --git a/src/test/run-pass/issue-21058.rs b/src/test/run-pass/issue-21058.rs index 9e8bfc884c9..5fe3434e499 100644 --- a/src/test/run-pass/issue-21058.rs +++ b/src/test/run-pass/issue-21058.rs @@ -26,5 +26,5 @@ fn main() { std::intrinsics::type_name::<NT>(), // DST std::intrinsics::type_name::<DST>() - )}, ("[u8]", "str", "core::marker::Copy", "NT", "DST")); + )}, ("[u8]", "str", "core::marker::Copy + 'static", "NT", "DST")); } |