about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-31 08:26:30 +0000
committerbors <bors@rust-lang.org>2014-08-31 08:26:30 +0000
commitdb47aa5bdf308213b4198b81e9d2e406ec716189 (patch)
tree4657767a7108317107eaf5789017729157449b41 /src/libsyntax/parse
parent499a40e59f62f6e860eb201d91f9ba9cecb99d35 (diff)
parent33029c5ddd255725f9ae701dec0a571256f8856c (diff)
downloadrust-db47aa5bdf308213b4198b81e9d2e406ec716189.tar.gz
rust-db47aa5bdf308213b4198b81e9d2e406ec716189.zip
auto merge of #16895 : alexcrichton/rust/rollup, r=alexcrichton
Let's try this again!
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 60f24401152..fc93e482adc 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -599,7 +599,7 @@ impl<'a> Parser<'a> {
             let token_str = self.this_token_to_string();
             let span = self.span;
             self.span_err(span,
-                          format!("found `{}` in ident position",
+                          format!("expected identifier, found keyword `{}`",
                                   token_str).as_slice());
         }
     }