about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authormcarton <cartonmartin+git@gmail.com>2016-09-02 01:58:44 +0200
committermcarton <cartonmartin+git@gmail.com>2016-10-28 12:52:41 +0200
commitf7cc6dc1eddc367f988017172d09d96ce191e5e1 (patch)
tree90c472f3100f49321ae6dec021ed08adbda6933f /src/libsyntax/parse
parent46d39f3329487115e7d7dcd37bc64eea6ef9ba4e (diff)
downloadrust-f7cc6dc1eddc367f988017172d09d96ce191e5e1.tar.gz
rust-f7cc6dc1eddc367f988017172d09d96ce191e5e1.zip
Fix bad error message with `::<` in types
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/parser.rs11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index a5a081e08be..6060b567847 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1757,6 +1757,17 @@ impl<'a> Parser<'a> {
             // First, parse an identifier.
             let identifier = self.parse_path_segment_ident()?;
 
+            if self.check(&token::ModSep) && self.look_ahead(1, |t| *t == token::Lt) {
+                self.bump();
+                let prev_span = self.prev_span;
+
+                let mut err = self.diagnostic().struct_span_err(prev_span,
+                    "unexpected token: `::`");
+                err.help(
+                    "use `<...>` instead of `::<...>` if you meant to specify type arguments");
+                err.emit();
+            }
+
             // Parse types, optionally.
             let parameters = if self.eat_lt() {
                 let (lifetimes, types, bindings) = self.parse_generic_values_after_lt()?;