diff options
| author | bors <bors@rust-lang.org> | 2016-10-28 10:20:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 10:20:55 -0700 |
| commit | 421b595f25e5dbab9c967afd03929d013f346322 (patch) | |
| tree | 0b59aec9588a4d629bf8ad15509f35d6ae33d9a1 /src/libsyntax/parse | |
| parent | 36d746718086dfcc12f73562b1996daf2f8ba643 (diff) | |
| parent | 61e765ad982c7b01753ebe9971b4ce407bbdb0d9 (diff) | |
| download | rust-421b595f25e5dbab9c967afd03929d013f346322.tar.gz rust-421b595f25e5dbab9c967afd03929d013f346322.zip | |
Auto merge of #37450 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 5 pull requests - Successful merges: #36206, #37343, #37430, #37436, #37441 - Failed merges:
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index d8dff6b4aa0..da5d754b599 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()?; |
