From d9134928552bd863295e5110e4fe1f53a6c81405 Mon Sep 17 00:00:00 2001
From: Ben Blum <bblum@andrew.cmu.edu>
Date: Thu, 9 Aug 2012 18:49:27 -0400
Subject: [PATCH] Change coherence error 'implement a trait instead' ->
 'implement a trait or new type instead'

---
 src/rustc/middle/typeck/coherence.rs               | 3 ++-
 src/test/compile-fail/trait-or-new-type-instead.rs | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 src/test/compile-fail/trait-or-new-type-instead.rs

diff --git a/src/rustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs
index 985b54a325c9..4da4d2c2482a 100644
--- a/src/rustc/middle/typeck/coherence.rs
+++ b/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");
                                     }
 
diff --git a/src/test/compile-fail/trait-or-new-type-instead.rs b/src/test/compile-fail/trait-or-new-type-instead.rs
new file mode 100644
index 000000000000..d41d0b7ea82b
--- /dev/null
+++ b/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() { }