diff options
| author | bors <bors@rust-lang.org> | 2013-08-17 22:52:00 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-17 22:52:00 -0700 |
| commit | 758c5e823621d1a6ef57f7a3a3cd5ba19116a777 (patch) | |
| tree | 2b5634a4a7607481b9456909332b3004e3ed988b /src/libsyntax/parse | |
| parent | 6a88415ed80cf98ff3c8864a2b1cbf57f32e6208 (diff) | |
| parent | 1fcb7ed9a67f316344b0b39e7682dceb1a61cf3e (diff) | |
| download | rust-758c5e823621d1a6ef57f7a3a3cd5ba19116a777.tar.gz rust-758c5e823621d1a6ef57f7a3a3cd5ba19116a777.zip | |
auto merge of #8547 : kballard/rust/trait-parse-err-msg, r=alexcrichton
When parsing a trait function, the function must end with either `;` or
`{` (signifying a default implementation). The error message incorrectly
stated that it must be `;` or `}`.
Fixes #6610.
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 a2664dcf890..de7abb8d1f4 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -953,7 +953,7 @@ impl Parser { _ => { p.fatal( fmt!( - "expected `;` or `}` but found `%s`", + "expected `;` or `{` but found `%s`", self.this_token_to_str() ) ); |