---

yaml
---
r: 225278
b: refs/heads/stable
c: d8d4a6a
h: refs/heads/master
v: v3

Author: Nick Hamann

[refs]

@@ -29,6 +29,6 @@ refs/heads/tmp: e5d90d98402475b6e154ce216f9efcb80da1a747
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: 1fe32ca12c51afcd761d9962f51a74ff0d07a591
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: efb5a85e59c07075bf39969ff4dc6390f49a8794
+refs/heads/stable: d8d4a6a842d0cd323e5eddff8ec1cbfcc66ac091
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b

branches/stable/src/libsyntax/parse/parser.rs

@@ -4564,7 +4564,7 @@ impl<'a> Parser<'a> {
         if try!(self.eat(&token::DotDot) ){
             if generics.is_parameterized() {
                 self.span_err(impl_span, "default trait implementations are not \
-                                          allowed to have genercis");
+                                          allowed to have generics");
             }
 
             try!(self.expect(&token::OpenDelim(token::Brace)));

branches/stable/src/test/compile-fail/syntaxt-default-trait-impls.rs

@@ -13,6 +13,6 @@
 trait MyDefaultImpl {}
 
 impl<T> MyDefaultImpl for .. {}
-//~^ ERROR default trait implementations are not allowed to have genercis
+//~^ ERROR default trait implementations are not allowed to have generics
 
 fn main() {}