---

yaml
---
r: 187737
b: refs/heads/tmp
c: 9ac0736
h: refs/heads/master
i:
  187735: 7e7df99
v: v3

Author: eddyb

[refs]

@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 866a5ee2999ae7cb96de58a77647509d090456ee
+refs/heads/tmp: 9ac073604c6689a773eb19bcc375234384326682
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/librustc_typeck/coherence/orphan.rs

@@ -15,7 +15,6 @@ use middle::traits;
 use middle::ty;
 use syntax::ast::{Item, ItemImpl};
 use syntax::ast;
-use syntax::ast_map;
 use syntax::ast_util;
 use syntax::visit;
 use util::ppaux::{Repr, UserString};

branches/tmp/src/test/compile-fail/issue-12729.rs renamed to branches/tmp/src/test/run-pass/issue-12729.rs

@@ -8,14 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-tidy-linelength
-
 pub struct Foo;
 
 mod bar {
     use Foo;
 
-    impl Foo { //~ERROR inherent implementations are only allowed on types defined in the current module
+    impl Foo {
         fn baz(&self) {}
     }
 }

branches/tmp/src/test/compile-fail/issue-7607-2.rs renamed to branches/tmp/src/test/run-pass/issue-7607-2.rs

@@ -8,15 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// ignore-tidy-linelength
-
 pub mod a {
     pub struct Foo { a: usize }
 }
 
 pub mod b {
     use a::Foo;
-    impl Foo { //~ERROR inherent implementations are only allowed on types defined in the current module
+    impl Foo {
         fn bar(&self) { }
     }
 }

branches/tmp/src/test/run-pass/trait-impl-2.rs

@@ -8,8 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-mod Foo {
-    trait Trait {
+pub mod Foo {
+    pub trait Trait {
         fn foo(&self);
     }
 }