about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNick Hamann <nick@wabbo.org>2015-05-21 01:17:50 -0500
committerNick Hamann <nick@wabbo.org>2015-05-26 15:12:52 -0500
commitd8d4a6a842d0cd323e5eddff8ec1cbfcc66ac091 (patch)
treeaa42e602e3672269cb2315b2cf3d1e7544806393
parentefb5a85e59c07075bf39969ff4dc6390f49a8794 (diff)
downloadrust-d8d4a6a842d0cd323e5eddff8ec1cbfcc66ac091.tar.gz
rust-d8d4a6a842d0cd323e5eddff8ec1cbfcc66ac091.zip
Fix typo.
-rw-r--r--src/libsyntax/parse/parser.rs2
-rw-r--r--src/test/compile-fail/syntaxt-default-trait-impls.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index eb6420165da..539d594cb8b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/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)));
diff --git a/src/test/compile-fail/syntaxt-default-trait-impls.rs b/src/test/compile-fail/syntaxt-default-trait-impls.rs
index a33cd0edca5..7d6a1c9c154 100644
--- a/src/test/compile-fail/syntaxt-default-trait-impls.rs
+++ b/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() {}