---

skade · skade · commit 006ad0a0d2f4 · 2013-10-06T09:56:46.000+02:00
yaml --- r: 83738 b: refs/heads/try c: 8154d23 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: c5c980ac2a46292a49fb1b2321340e0aebc6e71e
+refs/heads/try: 8154d23e44b6ea2c8c9464c3b396c2a5a45a50bf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/librustc/middle/typeck/coherence.rs b/branches/try/src/librustc/middle/typeck/coherence.rs
@@ -216,8 +216,8 @@ impl visit::Visitor<()> for PrivilegedScopeVisitor {
                             if trait_def_id.crate != LOCAL_CRATE {
                                 let session = self.cc.crate_context.tcx.sess;
                                 session.span_err(item.span,
-                                                 "cannot provide an extension implementation \
-                                                  for a trait not defined in this crate");
+                                        "cannot provide an extension implementation \
+                                        where both trait and type are not defined in this crate");
                             }
                         }
 

Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,8 @@ impl visit::Visitor<()> for PrivilegedScopeVisitor {`
`216`	`216`	`if trait_def_id.crate != LOCAL_CRATE {`
`217`	`217`	`let session = self.cc.crate_context.tcx.sess;`
`218`	`218`	`session.span_err(item.span,`
`219`		`- "cannot provide an extension implementation \`
`220`		`- for a trait not defined in this crate");`
	`219`	`+ "cannot provide an extension implementation \`
	`220`	`+ where both trait and type are not defined in this crate");`
`221`	`221`	`}`
`222`	`222`	`}`
`223`	`223`