diff options
| author | bors <bors@rust-lang.org> | 2015-05-26 23:10:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-05-26 23:10:06 +0000 |
| commit | fe85342ef6c04aeb35b0d0dbde82791f1a8721bb (patch) | |
| tree | af9ed9d47c7129008fb8ba1c41a72cda3a682d7b /src/libsyntax/parse | |
| parent | cccc137b888af7561687aae7e6af3ed32461c160 (diff) | |
| parent | 570a0435765864e2e51c8f953a645c544e9afdd4 (diff) | |
| download | rust-fe85342ef6c04aeb35b0d0dbde82791f1a8721bb.tar.gz rust-fe85342ef6c04aeb35b0d0dbde82791f1a8721bb.zip | |
Auto merge of #25688 - nham:E0055_E0192, r=alexcrichton
- Adds explanations for E0055, E0089, E0192, E0261-E0263, E0318
- Improves explanations for E0250, E0368, E0372.
- Converts 15 diagnostics to have error codes (E0380-E0394). Adds an explanation for E0380.
- The E0087-E0090 messages currently look like "expected {} parameter(s) found {} parameter(s)". This changes them to either use "parameter" or "parameters", based on the number.
This is, in part, more progress towards #24407
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 |
1 files changed, 1 insertions, 1 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))); |
