---

yaml
---
r: 276991
b: refs/heads/try
c: 69095bb
h: refs/heads/master
i:
  276989: fab8e3e
  276987: 7e96cad
  276983: b0487db
  276975: 69c3602
  276959: fddb4d4
  276927: 447ae1e
  276863: 996e7a6
  276735: c449fb3
  276479: 1837f60

Author: Manishearth

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 4805e1291af490b6c76f49ee241ac9f0bc0ceba4
+refs/heads/try: 69095bb02393b861c062fa80cde717e9eb7b2d29
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_typeck/diagnostics.rs

@@ -3651,23 +3651,23 @@ specialized further. Erroneous code example:
 ```compile_fail
 #![feature(specialization)]
 
-trait SpaceLama {
+trait SpaceLlama {
     fn fly(&self);
 }
 
 // applies to all T
-impl<T> SpaceLama for T {
+impl<T> SpaceLlama for T {
     default fn fly(&self) {}
 }
 
 // non-default impl
 // applies to all `Clone` T and overrides the previous impl
-impl<T: Clone> SpaceLama for T {
+impl<T: Clone> SpaceLlama for T {
     fn fly(&self) {}
 }
 
 // since `i32` is clone, this conflicts with the previous implementation
-impl SpaceLama for i32 {
+impl SpaceLlama for i32 {
     default fn fly(&self) {}
     // error: item `fly` is provided by an `impl` that specializes
     //        another, but the item in the parent `impl` is not marked
@@ -3684,23 +3684,23 @@ Example:
 ```
 #![feature(specialization)]
 
-trait SpaceLama {
+trait SpaceLlama {
     fn fly(&self);
 }
 
 // applies to all T
-impl<T> SpaceLama for T {
+impl<T> SpaceLlama for T {
     default fn fly(&self) {} // This is a parent implementation.
 }
 
 // applies to all `Clone` T; overrides the previous impl
-impl<T: Clone> SpaceLama for T {
+impl<T: Clone> SpaceLlama for T {
     default fn fly(&self) {} // This is a parent implementation but was
                              // previously not a default one, causing the error
 }
 
 // applies to i32, overrides the previous two impls
-impl SpaceLama for i32 {
+impl SpaceLlama for i32 {
     fn fly(&self) {} // And now that's ok!
 }
 ```