---

yaml
---
r: 151413
b: refs/heads/try2
c: 255908a
h: refs/heads/master
i:
  151411: ceac0ab
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 104e285eb8f848867c2666765e2aa8221e8a97d1
+refs/heads/try2: 255908ac953acb868ba7ee0c0cbfb8ae0cc3e44d
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/compile-fail/drop-on-non-struct.rs

@@ -13,7 +13,7 @@
 
 type Foo = Vec<u8>;
 
-impl Drop for Foo {   //~ ERROR conflicting implementations
+impl Drop for Foo {
 //~^ ERROR cannot provide an extension implementation
 //~^^ ERROR multiple applicable methods
     fn drop(&mut self) {

branches/try2/src/test/compile-fail/fully-qualified-type-name1.rs

@@ -13,5 +13,5 @@
 fn main() {
     let x: Option<uint>;
     x = 5;
-    //~^ ERROR mismatched types: expected `std::option::Option<uint>`
+    //~^ ERROR mismatched types: expected `core::option::Option<uint>`
 }

branches/try2/src/test/compile-fail/fully-qualified-type-name4.rs

@@ -14,7 +14,7 @@ use std::option::Option;
 
 fn bar(x: uint) -> Option<uint> {
     return x;
-    //~^ ERROR mismatched types: expected `std::option::Option<uint>`
+    //~^ ERROR mismatched types: expected `core::option::Option<uint>`
 }
 
 fn main() {

branches/try2/src/test/compile-fail/issue-13466.rs

@@ -16,7 +16,7 @@ pub fn main() {
     // tricked into looking up a non-existing second type parameter.
     let _x: uint = match Some(1u) {
     //~^ ERROR mismatched types: expected `uint` but found `<generic #0>`
-        Ok(u) => u, //~ ERROR  mismatched types: expected `std::option::Option<uint>`
-        Err(e) => fail!(e)  //~ ERROR mismatched types: expected `std::option::Option<uint>`
+        Ok(u) => u, //~ ERROR  mismatched types: expected `core::option::Option<uint>`
+        Err(e) => fail!(e)  //~ ERROR mismatched types: expected `core::option::Option<uint>`
     };
 }

branches/try2/src/test/compile-fail/issue-3680.rs

@@ -11,7 +11,7 @@
 fn main() {
     match None {
         Err(_) => ()
-        //~^ ERROR mismatched types: expected `std::option::Option<<generic #1>>`
-        //         but found `std::result::Result<<generic #2>,<generic #3>>`
+        //~^ ERROR mismatched types: expected `core::option::Option<<generic #1>>`
+        //         but found `core::result::Result<<generic #2>,<generic #3>>`
     }
 }

branches/try2/src/test/compile-fail/map-types.rs

@@ -18,6 +18,6 @@ fn main() {
     let x: Box<HashMap<~str, ~str>> = box HashMap::new();
     let x: Box<Map<~str, ~str>> = x;
     let y: Box<Map<uint, ~str>> = box x;
-    //~^ ERROR failed to find an implementation of trait std::container::Map<uint,~str>
-    //         for ~std::container::Map<~str,~str>:Send
+    //~^ ERROR failed to find an implementation of trait core::container::Map<uint,~str>
+    //         for ~core::container::Map<~str,~str>:Send
 }

branches/try2/src/test/compile-fail/noexporttypeexe.rs

@@ -18,5 +18,5 @@ fn main() {
     // because the def_id associated with the type was
     // not convertible to a path.
   let x: int = noexporttypelib::foo();
-    //~^ ERROR expected `int` but found `std::option::Option<int>`
+    //~^ ERROR expected `int` but found `core::option::Option<int>`
 }