---

yaml
---
r: 23116
b: refs/heads/master
c: d913492
h: refs/heads/master
v: v3

Author: bblum

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f0775d7bfe99617892e90e956be65cc80a28e070
+refs/heads/master: d9134928552bd863295e5110e4fe1f53a6c81405
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/typeck/coherence.rs

@@ -279,7 +279,7 @@ class CoherenceChecker {
                     session.span_err(item.span,
                                      ~"no base type found for inherent \
                                        implementation; implement a \
-                                       trait instead");
+                                       trait or new type instead");
                 }
                 some(_) => {
                     // Nothing to do.
@@ -490,6 +490,7 @@ class CoherenceChecker {
                                                           was defined in; \
                                                           define and \
                                                           implement a trait \
+                                                          or new type \
                                                           instead");
                                     }
 

trunk/src/test/compile-fail/trait-or-new-type-instead.rs

@@ -0,0 +1,6 @@
+// error-pattern: implement a trait or new type instead
+impl <T> option<T> {
+    fn foo() { }
+}
+
+fn main() { }