From 2359ab0dc9c52ab3447b581b88e4994c8f99d200 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 22 Dec 2015 16:56:13 +0100 Subject: Stop re-exporting PathParameters's variants. --- src/libsyntax/parse/parser.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/libsyntax/parse') 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::`, check for `::` before proceeding -- cgit 1.4.1-3-g733a5