bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Stop re-exporting PathParameters's variants.

Browse source
This commit is contained in:
Ms2ger 2015-12-22 16:56:13 +01:00
parent 42c3ef8f9f
commit 2359ab0dc9
8 changed files with 36 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/parse/parser.rs
View file

@ -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