Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / test / compile-fail / on-unimplemented.rs

diff --git a/src/test/compile-fail/on-unimplemented.rs b/src/test/compile-fail/on-unimplemented.rs
index c4eb467c4f96143da28576de025979f19b89d101..39ce1b33ca13122b275642f24761987f645aab0f 100644 (file)
--- a/src/test/compile-fail/on-unimplemented.rs
+++ b/src/test/compile-fail/on-unimplemented.rs
@@ -33,7 +33,9 @@ pub fn main() {
     let x = vec!(1u8, 2, 3, 4);
     let y: Option<Vec<u8>> = collect(x.iter()); // this should give approximately the same error for x.iter().collect()
     //~^ ERROR
-    //~^^ NOTE a collection of type `core::option::Option<collections::vec::Vec<u8>>` cannot be built from an iterator over elements of type `&u8`
+    //~^^ NOTE a collection of type `std::option::Option<std::vec::Vec<u8>>` cannot be built from an iterator over elements of type `&u8`
+    //~^^^ NOTE required by `collect`
     let x: String = foobar(); //~ ERROR
-    //~^ NOTE test error `collections::string::String` with `u8` `_` `u32`
+    //~^ NOTE test error `std::string::String` with `u8` `_` `u32`
+    //~^^ NOTE required by `foobar`
 }