diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-12-22 16:56:13 +0100 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-12-22 17:12:33 +0100 |
| commit | 2359ab0dc9c52ab3447b581b88e4994c8f99d200 (patch) | |
| tree | 2bd1b31493712039a6470b8d2846fea440afd2c6 /src/libsyntax/parse | |
| parent | 42c3ef8f9fd4b0dd1f881c49323bad456163f202 (diff) | |
| download | rust-2359ab0dc9c52ab3447b581b88e4994c8f99d200.tar.gz rust-2359ab0dc9c52ab3447b581b88e4994c8f99d200.zip | |
Stop re-exporting PathParameters's variants.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index dbd34b49f7d..5c2d9927efc 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1706,7 +1706,7 @@ impl<'a> Parser<'a> { let parameters = if try!(self.eat_lt() ){ let (lifetimes, types, bindings) = try!(self.parse_generic_values_after_lt()); - ast::AngleBracketedParameters(ast::AngleBracketedParameterData { + ast::PathParameters::AngleBracketed(ast::AngleBracketedParameterData { lifetimes: lifetimes, types: P::from_vec(types), bindings: P::from_vec(bindings), @@ -1727,7 +1727,7 @@ impl<'a> Parser<'a> { let hi = self.last_span.hi; - ast::ParenthesizedParameters(ast::ParenthesizedParameterData { + ast::PathParameters::Parenthesized(ast::ParenthesizedParameterData { span: mk_sp(lo, hi), inputs: inputs, output: output_ty, @@ -1768,13 +1768,14 @@ impl<'a> Parser<'a> { if try!(self.eat_lt() ){ // Consumed `a::b::<`, go look for types let (lifetimes, types, bindings) = try!(self.parse_generic_values_after_lt()); + let parameters = ast::AngleBracketedParameterData { + lifetimes: lifetimes, + types: P::from_vec(types), + bindings: P::from_vec(bindings), + }; segments.push(ast::PathSegment { identifier: identifier, - parameters: ast::AngleBracketedParameters(ast::AngleBracketedParameterData { - lifetimes: lifetimes, - types: P::from_vec(types), - bindings: P::from_vec(bindings), - }), + parameters: ast::PathParameters::AngleBracketed(parameters), }); // Consumed `a::b::<T,U>`, check for `::` before proceeding |
