From 2efe865d22eb85871562b2497ac819efc0174a3d Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Mon, 16 Jan 2017 23:33:45 +0300 Subject: AST/HIR: Merge ObjectSum and PolyTraitRef --- src/libsyntax/parse/parser.rs | 56 +++++++++++++++++++++++++++++++++++++++---- 1 file changed, 52 insertions(+), 4 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 167fa78d7e0..bae08da0a64 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -40,7 +40,7 @@ use ast::{Visibility, WhereClause}; use ast::{BinOpKind, UnOp}; use {ast, attr}; use codemap::{self, CodeMap, Spanned, spanned, respan}; -use syntax_pos::{self, Span, BytePos, mk_sp}; +use syntax_pos::{self, Span, Pos, BytePos, mk_sp}; use errors::{self, DiagnosticBuilder}; use ext::tt::macro_parser; use parse; @@ -1045,7 +1045,7 @@ impl<'a> Parser<'a> { Some(TraitTyParamBound(poly_trait_ref, TraitBoundModifier::None)).into_iter() .chain(other_bounds.into_vec()) .collect(); - Ok(ast::TyKind::PolyTraitRef(all_bounds)) + Ok(ast::TyKind::ObjectSum(all_bounds)) } } @@ -1267,7 +1267,7 @@ impl<'a> Parser<'a> { return Ok(lhs); } - let bounds = self.parse_ty_param_bounds()?; + let mut bounds = self.parse_ty_param_bounds()?.into_vec(); // In type grammar, `+` is treated like a binary operator, // and hence both L and R side are required. @@ -1277,9 +1277,57 @@ impl<'a> Parser<'a> { "at least one type parameter bound \ must be specified"); } + if let TyKind::Path(None, ref path) = lhs.node { + let poly_trait_ref = PolyTraitRef { + bound_lifetimes: Vec::new(), + trait_ref: TraitRef { path: path.clone(), ref_id: lhs.id }, + span: lhs.span, + }; + let poly_trait_ref = TraitTyParamBound(poly_trait_ref, TraitBoundModifier::None); + bounds.insert(0, poly_trait_ref); + } else { + let mut err = struct_span_err!(self.sess.span_diagnostic, lhs.span, E0178, + "expected a path on the left-hand side \ + of `+`, not `{}`", + pprust::ty_to_string(&lhs)); + err.span_label(lhs.span, &format!("expected a path")); + let hi = bounds.iter().map(|x| match *x { + ast::TraitTyParamBound(ref tr, _) => tr.span.hi, + ast::RegionTyParamBound(ref r) => r.span.hi, + }).max_by_key(|x| x.to_usize()); + let full_span = hi.map(|hi| Span { + lo: lhs.span.lo, + hi: hi, + expn_id: lhs.span.expn_id, + }); + match (&lhs.node, full_span) { + (&TyKind::Rptr(ref lifetime, ref mut_ty), Some(full_span)) => { + let ty_str = pprust::to_string(|s| { + use print::pp::word; + use print::pprust::PrintState; + + word(&mut s.s, "&")?; + s.print_opt_lifetime(lifetime)?; + s.print_mutability(mut_ty.mutbl)?; + s.popen()?; + s.print_type(&mut_ty.ty)?; + s.print_bounds(" +", &bounds)?; + s.pclose() + }); + err.span_suggestion(full_span, "try adding parentheses (per RFC 438):", + ty_str); + } + + _ => { + help!(&mut err, + "perhaps you forgot parentheses? (per RFC 438)"); + } + } + err.emit(); + } let sp = mk_sp(lo, self.prev_span.hi); - let sum = ast::TyKind::ObjectSum(lhs, bounds); + let sum = TyKind::ObjectSum(bounds.into()); Ok(P(Ty {id: ast::DUMMY_NODE_ID, node: sum, span: sp})) } -- cgit 1.4.1-3-g733a5 From 03620dba25328ee8cc7316cf6d9bad2d0a118ba1 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Tue, 17 Jan 2017 01:54:59 +0300 Subject: Use resizable Vec instead of P<[T]> in AST --- src/librustc/hir/lowering.rs | 2 +- src/libsyntax/ast.rs | 10 ++++----- src/libsyntax/ext/build.rs | 25 ++++----------------- src/libsyntax/fold.rs | 5 ++--- src/libsyntax/parse/mod.rs | 2 +- src/libsyntax/parse/parser.rs | 36 +++++++++++++++---------------- src/libsyntax/print/pprust.rs | 4 ++-- src/libsyntax_ext/deriving/generic/mod.rs | 9 ++++---- src/libsyntax_ext/deriving/generic/ty.rs | 2 +- 9 files changed, 38 insertions(+), 57 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index 9a0ef6537ce..ee6f91bd414 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -596,7 +596,7 @@ impl<'a> LoweringContext<'a> { } } - fn lower_ty_params(&mut self, tps: &P<[TyParam]>, add_bounds: &NodeMap>) + fn lower_ty_params(&mut self, tps: &Vec, add_bounds: &NodeMap>) -> hir::HirVec { tps.iter().map(|tp| { self.lower_ty_param(tp, add_bounds.get(&tp.id).map_or(&[][..], |x| &x)) diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 6c69aa14bcf..2d7dfe50415 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -204,11 +204,11 @@ pub struct AngleBracketedParameterData { /// The lifetime parameters for this path segment. pub lifetimes: Vec, /// The type parameters for this path segment, if present. - pub types: P<[P]>, + pub types: Vec>, /// Bindings (equality constraints) on associated types, if present. /// /// E.g., `Foo`. - pub bindings: P<[TypeBinding]>, + pub bindings: Vec, } impl Into>> for AngleBracketedParameterData { @@ -297,7 +297,7 @@ pub enum TraitBoundModifier { Maybe, } -pub type TyParamBounds = P<[TyParamBound]>; +pub type TyParamBounds = Vec; #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)] pub struct TyParam { @@ -314,7 +314,7 @@ pub struct TyParam { #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)] pub struct Generics { pub lifetimes: Vec, - pub ty_params: P<[TyParam]>, + pub ty_params: Vec, pub where_clause: WhereClause, pub span: Span, } @@ -344,7 +344,7 @@ impl Default for Generics { fn default() -> Generics { Generics { lifetimes: Vec::new(), - ty_params: P::new(), + ty_params: Vec::new(), where_clause: WhereClause { id: DUMMY_NODE_ID, predicates: Vec::new(), diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index fc3cbf20fb9..b234677f544 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -67,9 +67,6 @@ pub trait AstBuilder { fn ty_option(&self, ty: P) -> P; fn ty_infer(&self, sp: Span) -> P; - fn ty_vars(&self, ty_params: &P<[ast::TyParam]>) -> Vec> ; - fn ty_vars_global(&self, ty_params: &P<[ast::TyParam]>) -> Vec> ; - fn typaram(&self, span: Span, id: ast::Ident, @@ -333,8 +330,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> { } else { Some(P(ast::PathParameters::AngleBracketed(ast::AngleBracketedParameterData { lifetimes: lifetimes, - types: P::from_vec(types), - bindings: P::from_vec(bindings), + types: types, + bindings: bindings, }))) }; segments.push(ast::PathSegment { identifier: last_identifier, parameters: parameters }); @@ -369,8 +366,8 @@ impl<'a> AstBuilder for ExtCtxt<'a> { let mut path = trait_path; let parameters = ast::AngleBracketedParameterData { lifetimes: lifetimes, - types: P::from_vec(types), - bindings: P::from_vec(bindings), + types: types, + bindings: bindings, }; path.segments.push(ast::PathSegment { identifier: ident, @@ -458,20 +455,6 @@ impl<'a> AstBuilder for ExtCtxt<'a> { } } - // these are strange, and probably shouldn't be used outside of - // pipes. Specifically, the global version possible generates - // incorrect code. - fn ty_vars(&self, ty_params: &P<[ast::TyParam]>) -> Vec> { - ty_params.iter().map(|p| self.ty_ident(DUMMY_SP, p.ident)).collect() - } - - fn ty_vars_global(&self, ty_params: &P<[ast::TyParam]>) -> Vec> { - ty_params - .iter() - .map(|p| self.ty_path(self.path_global(DUMMY_SP, vec![p.ident]))) - .collect() - } - fn trait_ref(&self, path: ast::Path) -> ast::TraitRef { ast::TraitRef { path: path, diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 8b045f1b530..2acf1c8f8fb 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -225,7 +225,7 @@ pub trait Folder : Sized { noop_fold_ty_param(tp, self) } - fn fold_ty_params(&mut self, tps: P<[TyParam]>) -> P<[TyParam]> { + fn fold_ty_params(&mut self, tps: Vec) -> Vec { noop_fold_ty_params(tps, self) } @@ -674,8 +674,7 @@ pub fn noop_fold_ty_param(tp: TyParam, fld: &mut T) -> TyParam { } } -pub fn noop_fold_ty_params(tps: P<[TyParam]>, fld: &mut T) - -> P<[TyParam]> { +pub fn noop_fold_ty_params(tps: Vec, fld: &mut T) -> Vec { tps.move_map(|tp| fld.fold_ty_param(tp)) } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 32b61a88ac1..1a1950dc45c 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -847,7 +847,7 @@ mod tests { Abi::Rust, ast::Generics{ // no idea on either of these: lifetimes: Vec::new(), - ty_params: P::new(), + ty_params: Vec::new(), where_clause: ast::WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index bae08da0a64..b5063528d03 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -685,7 +685,7 @@ impl<'a> Parser<'a> { pub fn parse_seq_to_before_gt_or_return(&mut self, sep: Option, mut f: F) - -> PResult<'a, (P<[T]>, bool)> + -> PResult<'a, (Vec, bool)> where F: FnMut(&mut Parser<'a>) -> PResult<'a, Option>, { let mut v = Vec::new(); @@ -706,7 +706,7 @@ impl<'a> Parser<'a> { if i % 2 == 0 { match f(self)? { Some(result) => v.push(result), - None => return Ok((P::from_vec(v), true)) + None => return Ok((v, true)) } } else { if let Some(t) = sep.as_ref() { @@ -715,7 +715,7 @@ impl<'a> Parser<'a> { } } - return Ok((P::from_vec(v), false)); + return Ok((v, false)); } /// Parse a sequence bracketed by '<' and '>', stopping @@ -723,7 +723,7 @@ impl<'a> Parser<'a> { pub fn parse_seq_to_before_gt(&mut self, sep: Option, mut f: F) - -> PResult<'a, P<[T]>> where + -> PResult<'a, Vec> where F: FnMut(&mut Parser<'a>) -> PResult<'a, T>, { let (result, returned) = self.parse_seq_to_before_gt_or_return(sep, @@ -735,7 +735,7 @@ impl<'a> Parser<'a> { pub fn parse_seq_to_gt(&mut self, sep: Option, f: F) - -> PResult<'a, P<[T]>> where + -> PResult<'a, Vec> where F: FnMut(&mut Parser<'a>) -> PResult<'a, T>, { let v = self.parse_seq_to_before_gt(sep, f)?; @@ -746,7 +746,7 @@ impl<'a> Parser<'a> { pub fn parse_seq_to_gt_or_return(&mut self, sep: Option, f: F) - -> PResult<'a, (P<[T]>, bool)> where + -> PResult<'a, (Vec, bool)> where F: FnMut(&mut Parser<'a>) -> PResult<'a, Option>, { let (v, returned) = self.parse_seq_to_before_gt_or_return(sep, f)?; @@ -1039,11 +1039,11 @@ impl<'a> Parser<'a> { let other_bounds = if self.eat(&token::BinOp(token::Plus)) { self.parse_ty_param_bounds()? } else { - P::new() + Vec::new() }; let all_bounds = Some(TraitTyParamBound(poly_trait_ref, TraitBoundModifier::None)).into_iter() - .chain(other_bounds.into_vec()) + .chain(other_bounds) .collect(); Ok(ast::TyKind::ObjectSum(all_bounds)) } @@ -1267,7 +1267,7 @@ impl<'a> Parser<'a> { return Ok(lhs); } - let mut bounds = self.parse_ty_param_bounds()?.into_vec(); + let mut bounds = self.parse_ty_param_bounds()?; // In type grammar, `+` is treated like a binary operator, // and hence both L and R side are required. @@ -1327,7 +1327,7 @@ impl<'a> Parser<'a> { } let sp = mk_sp(lo, self.prev_span.hi); - let sum = TyKind::ObjectSum(bounds.into()); + let sum = TyKind::ObjectSum(bounds); Ok(P(Ty {id: ast::DUMMY_NODE_ID, node: sum, span: sp})) } @@ -1759,8 +1759,8 @@ impl<'a> Parser<'a> { let (lifetimes, types, bindings) = self.parse_generic_values_after_lt()?; ast::AngleBracketedParameterData { lifetimes: lifetimes, - types: P::from_vec(types), - bindings: P::from_vec(bindings), + types: types, + bindings: bindings, }.into() } else if self.eat(&token::OpenDelim(token::Paren)) { let lo = self.prev_span.lo; @@ -1819,8 +1819,8 @@ impl<'a> Parser<'a> { identifier: identifier, parameters: ast::AngleBracketedParameterData { lifetimes: lifetimes, - types: P::from_vec(types), - bindings: P::from_vec(bindings), + types: types, + bindings: bindings, }.into(), }); @@ -4192,7 +4192,7 @@ impl<'a> Parser<'a> { fn parse_colon_then_ty_param_bounds(&mut self) -> PResult<'a, TyParamBounds> { if !self.eat(&token::Colon) { - Ok(P::new()) + Ok(Vec::new()) } else { self.parse_ty_param_bounds() } @@ -4238,7 +4238,7 @@ impl<'a> Parser<'a> { } } - return Ok(P::from_vec(result)); + return Ok(result); } /// Matches typaram = IDENT (`?` unbound)? optbounds ( EQ ty )? @@ -4375,7 +4375,7 @@ impl<'a> Parser<'a> { // If we found the `>`, don't continue. if !returned { - return Ok((lifetimes, types.into_vec(), Vec::new())); + return Ok((lifetimes, types, Vec::new())); } // Then parse type bindings. @@ -4396,7 +4396,7 @@ impl<'a> Parser<'a> { }); } )?; - Ok((lifetimes, types.into_vec(), bindings.into_vec())) + Ok((lifetimes, types, bindings)) } fn forbid_lifetime(&mut self) -> PResult<'a, ()> { diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 31e6f25559d..c989aa59e87 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1009,7 +1009,7 @@ impl<'a> State<'a> { ast::TyKind::BareFn(ref f) => { let generics = ast::Generics { lifetimes: f.lifetimes.clone(), - ty_params: P::new(), + ty_params: Vec::new(), where_clause: ast::WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), @@ -2973,7 +2973,7 @@ impl<'a> State<'a> { } let generics = ast::Generics { lifetimes: Vec::new(), - ty_params: P::new(), + ty_params: Vec::new(), where_clause: ast::WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index b99b1019368..ce64aef516f 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -507,9 +507,8 @@ impl<'a> TraitDef<'a> { } }); - let Generics { mut lifetimes, ty_params, mut where_clause, span } = self.generics + let Generics { mut lifetimes, mut ty_params, mut where_clause, span } = self.generics .to_generics(cx, self.span, type_ident, generics); - let mut ty_params = ty_params.into_vec(); // Copy the lifetimes lifetimes.extend(generics.lifetimes.iter().cloned()); @@ -533,7 +532,7 @@ impl<'a> TraitDef<'a> { bounds.push((*declared_bound).clone()); } - cx.typaram(self.span, ty_param.ident, vec![], P::from_vec(bounds), None) + cx.typaram(self.span, ty_param.ident, vec![], bounds, None) })); // and similarly for where clauses @@ -596,7 +595,7 @@ impl<'a> TraitDef<'a> { span: self.span, bound_lifetimes: vec![], bounded_ty: ty, - bounds: P::from_vec(bounds), + bounds: bounds, }; let predicate = ast::WherePredicate::BoundPredicate(predicate); @@ -607,7 +606,7 @@ impl<'a> TraitDef<'a> { let trait_generics = Generics { lifetimes: lifetimes, - ty_params: P::from_vec(ty_params), + ty_params: ty_params, where_clause: where_clause, span: span, }; diff --git a/src/libsyntax_ext/deriving/generic/ty.rs b/src/libsyntax_ext/deriving/generic/ty.rs index 4749d082bc0..cfd52381538 100644 --- a/src/libsyntax_ext/deriving/generic/ty.rs +++ b/src/libsyntax_ext/deriving/generic/ty.rs @@ -212,7 +212,7 @@ fn mk_generics(lifetimes: Vec, ty_params: Vec, s -> Generics { Generics { lifetimes: lifetimes, - ty_params: P::from_vec(ty_params), + ty_params: ty_params, where_clause: ast::WhereClause { id: ast::DUMMY_NODE_ID, predicates: Vec::new(), -- cgit 1.4.1-3-g733a5 From 869b81646d527d9eb37bc73c526e0567a107aea7 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Tue, 17 Jan 2017 02:13:41 +0300 Subject: syntax: Rename parse_ty -> parse_ty_no_plus, parse_ty_sum -> parse_ty --- src/libsyntax/ext/expand.rs | 2 +- src/libsyntax/ext/quote.rs | 2 +- src/libsyntax/ext/tt/macro_parser.rs | 2 +- src/libsyntax/parse/parser.rs | 78 +++++++++++++++++++----------------- 4 files changed, 44 insertions(+), 40 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 3a8f9126b49..26e731e1a5e 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -540,7 +540,7 @@ impl<'a> Parser<'a> { } ExpansionKind::Expr => Expansion::Expr(self.parse_expr()?), ExpansionKind::OptExpr => Expansion::OptExpr(Some(self.parse_expr()?)), - ExpansionKind::Ty => Expansion::Ty(self.parse_ty()?), + ExpansionKind::Ty => Expansion::Ty(self.parse_ty_no_plus()?), ExpansionKind::Pat => Expansion::Pat(self.parse_pat()?), }) } diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index d2eb2636e6b..c0cbda4ba12 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -388,7 +388,7 @@ pub fn parse_arm_panic(parser: &mut Parser) -> Arm { } pub fn parse_ty_panic(parser: &mut Parser) -> P { - panictry!(parser.parse_ty()) + panictry!(parser.parse_ty_no_plus()) } pub fn parse_stmt_panic(parser: &mut Parser) -> Option { diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs index 2de31166070..87c8f3efb63 100644 --- a/src/libsyntax/ext/tt/macro_parser.rs +++ b/src/libsyntax/ext/tt/macro_parser.rs @@ -522,7 +522,7 @@ fn parse_nt<'a>(p: &mut Parser<'a>, sp: Span, name: &str) -> Nonterminal { }, "pat" => token::NtPat(panictry!(p.parse_pat())), "expr" => token::NtExpr(panictry!(p.parse_expr())), - "ty" => token::NtTy(panictry!(p.parse_ty())), + "ty" => token::NtTy(panictry!(p.parse_ty_no_plus())), // this could be handled like a token, since it is one "ident" => match p.token { token::Ident(sn) => { diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index b5063528d03..60ad6a76f4d 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1128,7 +1128,7 @@ impl<'a> Parser<'a> { self.expect_keyword(keywords::Const)?; let ident = self.parse_ident()?; self.expect(&token::Colon)?; - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; let default = if self.check(&token::Eq) { self.bump(); let expr = self.parse_expr()?; @@ -1244,24 +1244,24 @@ impl<'a> Parser<'a> { /// Parse a possibly mutable type pub fn parse_mt(&mut self) -> PResult<'a, MutTy> { let mutbl = self.parse_mutability()?; - let t = self.parse_ty()?; + let t = self.parse_ty_no_plus()?; Ok(MutTy { ty: t, mutbl: mutbl }) } /// Parse optional return type [ -> TY ] in function decl pub fn parse_ret_ty(&mut self) -> PResult<'a, FunctionRetTy> { if self.eat(&token::RArrow) { - Ok(FunctionRetTy::Ty(self.parse_ty()?)) + Ok(FunctionRetTy::Ty(self.parse_ty_no_plus()?)) } else { let pos = self.span.lo; Ok(FunctionRetTy::Default(mk_sp(pos, pos))) } } - /// Parse a type in a context where `T1+T2` is allowed. - pub fn parse_ty_sum(&mut self) -> PResult<'a, P> { + /// Parse a type. + pub fn parse_ty(&mut self) -> PResult<'a, P> { let lo = self.span.lo; - let lhs = self.parse_ty()?; + let lhs = self.parse_ty_no_plus()?; if !self.eat(&token::BinOp(token::Plus)) { return Ok(lhs); @@ -1331,8 +1331,12 @@ impl<'a> Parser<'a> { Ok(P(Ty {id: ast::DUMMY_NODE_ID, node: sum, span: sp})) } - /// Parse a type. - pub fn parse_ty(&mut self) -> PResult<'a, P> { + /// Parse a type in restricted contexts where `+` is not permitted. + /// Example 1: `&'a TYPE` + /// `+` is prohibited to maintain operator priority (P(+) < P(&)). + /// Example 2: `value1 as TYPE + value2` + /// `+` is prohibited to avoid interactions with expression grammar. + pub fn parse_ty_no_plus(&mut self) -> PResult<'a, P> { maybe_whole!(self, NtTy, |x| x); let lo = self.span.lo; @@ -1346,7 +1350,7 @@ impl<'a> Parser<'a> { let mut ts = vec![]; let mut last_comma = false; while self.token != token::CloseDelim(token::Paren) { - ts.push(self.parse_ty_sum()?); + ts.push(self.parse_ty()?); if self.check(&token::Comma) { last_comma = true; self.bump(); @@ -1371,7 +1375,7 @@ impl<'a> Parser<'a> { } else if self.check(&token::OpenDelim(token::Bracket)) { // VECTOR self.expect(&token::OpenDelim(token::Bracket))?; - let t = self.parse_ty_sum()?; + let t = self.parse_ty()?; // Parse the `; e` in `[ i32; e ]` // where `e` is a const expression @@ -1452,7 +1456,7 @@ impl<'a> Parser<'a> { `*mut T` or `*const T` as appropriate)"); Mutability::Immutable }; - let t = self.parse_ty()?; + let t = self.parse_ty_no_plus()?; Ok(MutTy { ty: t, mutbl: mutbl }) } @@ -1499,7 +1503,7 @@ impl<'a> Parser<'a> { }) }; - let t = self.parse_ty_sum()?; + let t = self.parse_ty()?; Ok(Arg { ty: t, @@ -1517,7 +1521,7 @@ impl<'a> Parser<'a> { pub fn parse_fn_block_arg(&mut self) -> PResult<'a, Arg> { let pat = self.parse_pat()?; let t = if self.eat(&token::Colon) { - self.parse_ty_sum()? + self.parse_ty()? } else { P(Ty { id: ast::DUMMY_NODE_ID, @@ -1658,7 +1662,7 @@ impl<'a> Parser<'a> { pub fn parse_qualified_path(&mut self, mode: PathStyle) -> PResult<'a, (QSelf, ast::Path)> { let span = self.prev_span; - let self_type = self.parse_ty_sum()?; + let self_type = self.parse_ty()?; let mut path = if self.eat_keyword(keywords::As) { self.parse_path(PathStyle::Type)? } else { @@ -1768,10 +1772,10 @@ impl<'a> Parser<'a> { let inputs = self.parse_seq_to_end( &token::CloseDelim(token::Paren), SeqSep::trailing_allowed(token::Comma), - |p| p.parse_ty_sum())?; + |p| p.parse_ty())?; let output_ty = if self.eat(&token::RArrow) { - Some(self.parse_ty()?) + Some(self.parse_ty_no_plus()?) } else { None }; @@ -2981,12 +2985,12 @@ impl<'a> Parser<'a> { } // Special cases: if op == AssocOp::As { - let rhs = self.parse_ty()?; + let rhs = self.parse_ty_no_plus()?; let (lo, hi) = (lhs_span.lo, rhs.span.hi); lhs = self.mk_expr(lo, hi, ExprKind::Cast(lhs, rhs), ThinVec::new()); continue } else if op == AssocOp::Colon { - let rhs = self.parse_ty()?; + let rhs = self.parse_ty_no_plus()?; let (lo, hi) = (lhs_span.lo, rhs.span.hi); lhs = self.mk_expr(lo, hi, ExprKind::Type(lhs, rhs), ThinVec::new()); continue @@ -3754,7 +3758,7 @@ impl<'a> Parser<'a> { let mut ty = None; if self.eat(&token::Colon) { - ty = Some(self.parse_ty_sum()?); + ty = Some(self.parse_ty()?); } let init = self.parse_initializer()?; Ok(P(ast::Local { @@ -3775,7 +3779,7 @@ impl<'a> Parser<'a> { -> PResult<'a, StructField> { let name = self.parse_ident()?; self.expect(&token::Colon)?; - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; Ok(StructField { span: mk_sp(lo, self.prev_span.hi), ident: Some(name), @@ -4250,7 +4254,7 @@ impl<'a> Parser<'a> { let default = if self.check(&token::Eq) { self.bump(); - Some(self.parse_ty_sum()?) + Some(self.parse_ty()?) } else { None }; @@ -4345,7 +4349,7 @@ impl<'a> Parser<'a> { let mut err = self.diagnostic().struct_span_err(self.span, &msg); let span_hi = self.span.hi; - let span_hi = match self.parse_ty() { + let span_hi = match self.parse_ty_no_plus() { Ok(..) => self.span.hi, Err(ref mut err) => { self.cancel(err); @@ -4368,7 +4372,7 @@ impl<'a> Parser<'a> { if p.look_ahead(1, |t| t == &token::Eq) { Ok(None) } else { - Ok(Some(p.parse_ty_sum()?)) + Ok(Some(p.parse_ty()?)) } } )?; @@ -4386,7 +4390,7 @@ impl<'a> Parser<'a> { let lo = p.span.lo; let ident = p.parse_ident()?; p.expect(&token::Eq)?; - let ty = p.parse_ty()?; + let ty = p.parse_ty_no_plus()?; let hi = ty.span.hi; let span = mk_sp(lo, hi); return Ok(TypeBinding{id: ast::DUMMY_NODE_ID, @@ -4484,7 +4488,7 @@ impl<'a> Parser<'a> { vec![] }; - let bounded_ty = self.parse_ty()?; + let bounded_ty = self.parse_ty_no_plus()?; if self.eat(&token::Colon) { let bounds = self.parse_ty_param_bounds()?; @@ -4507,7 +4511,7 @@ impl<'a> Parser<'a> { parsed_something = true; } else if self.eat(&token::Eq) { - // let ty = try!(self.parse_ty()); + // let ty = try!(self.parse_ty_no_plus()); let hi = self.prev_span.hi; let span = mk_sp(lo, hi); // where_clause.predicates.push( @@ -4679,7 +4683,7 @@ impl<'a> Parser<'a> { // self: TYPE let eself_ident = expect_ident(self); if self.eat(&token::Colon) { - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; (SelfKind::Explicit(ty, Mutability::Immutable), eself_ident) } else { (SelfKind::Value(Mutability::Immutable), eself_ident) @@ -4691,7 +4695,7 @@ impl<'a> Parser<'a> { self.bump(); let eself_ident = expect_ident(self); if self.eat(&token::Colon) { - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; (SelfKind::Explicit(ty, Mutability::Mutable), eself_ident) } else { (SelfKind::Value(Mutability::Mutable), eself_ident) @@ -4848,14 +4852,14 @@ impl<'a> Parser<'a> { let (name, node) = if self.eat_keyword(keywords::Type) { let name = self.parse_ident()?; self.expect(&token::Eq)?; - let typ = self.parse_ty_sum()?; + let typ = self.parse_ty()?; self.expect(&token::Semi)?; (name, ast::ImplItemKind::Type(typ)) } else if self.is_const_item() { self.expect_keyword(keywords::Const)?; let name = self.parse_ident()?; self.expect(&token::Colon)?; - let typ = self.parse_ty_sum()?; + let typ = self.parse_ty()?; self.expect(&token::Eq)?; let expr = self.parse_expr()?; self.expect(&token::Semi)?; @@ -4979,7 +4983,7 @@ impl<'a> Parser<'a> { }; // Parse the trait. - let mut ty = self.parse_ty_sum()?; + let mut ty = self.parse_ty()?; // Parse traits, if necessary. let opt_trait = if could_be_trait && self.eat_keyword(keywords::For) { @@ -5020,7 +5024,7 @@ impl<'a> Parser<'a> { ItemKind::DefaultImpl(unsafety, opt_trait.unwrap()), None)) } else { if opt_trait.is_some() { - ty = self.parse_ty_sum()?; + ty = self.parse_ty()?; } generics.where_clause = self.parse_where_clause()?; @@ -5172,7 +5176,7 @@ impl<'a> Parser<'a> { let mut vis = p.parse_visibility(false)?; let ty_is_interpolated = p.token.is_interpolated() || p.look_ahead(1, |t| t.is_interpolated()); - let mut ty = p.parse_ty_sum()?; + let mut ty = p.parse_ty()?; // Handle `pub(path) type`, in which `vis` will be `pub` and `ty` will be `(path)`. if vis == Visibility::Public && !ty_is_interpolated && @@ -5180,7 +5184,7 @@ impl<'a> Parser<'a> { ty = if let TyKind::Paren(ref path_ty) = ty.node { if let TyKind::Path(None, ref path) = path_ty.node { vis = Visibility::Restricted { path: P(path.clone()), id: path_ty.id }; - Some(p.parse_ty_sum()?) + Some(p.parse_ty()?) } else { None } @@ -5298,7 +5302,7 @@ impl<'a> Parser<'a> { fn parse_item_const(&mut self, m: Option) -> PResult<'a, ItemInfo> { let id = self.parse_ident()?; self.expect(&token::Colon)?; - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; self.expect(&token::Eq)?; let e = self.parse_expr()?; self.expect(&token::Semi)?; @@ -5539,7 +5543,7 @@ impl<'a> Parser<'a> { let ident = self.parse_ident()?; self.expect(&token::Colon)?; - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; let hi = self.span.hi; self.expect(&token::Semi)?; Ok(ForeignItem { @@ -5628,7 +5632,7 @@ impl<'a> Parser<'a> { let mut tps = self.parse_generics()?; tps.where_clause = self.parse_where_clause()?; self.expect(&token::Eq)?; - let ty = self.parse_ty_sum()?; + let ty = self.parse_ty()?; self.expect(&token::Semi)?; Ok((ident, ItemKind::Ty(ty, tps), None)) } -- cgit 1.4.1-3-g733a5 From 66ef5f2bb55f3204d50b5011e3d15385065834c1 Mon Sep 17 00:00:00 2001 From: Vadim Petrochenkov Date: Tue, 17 Jan 2017 10:41:44 +0300 Subject: Rename ObjectSum into TraitObject in AST/HIR --- src/librustc/hir/intravisit.rs | 2 +- src/librustc/hir/lowering.rs | 4 ++-- src/librustc/hir/mod.rs | 2 +- src/librustc/hir/print.rs | 2 +- src/librustc_incremental/calculate_svh/svh_visitor.rs | 2 +- src/librustc_passes/ast_validation.rs | 2 +- src/librustc_typeck/astconv.rs | 4 ++-- src/librustdoc/clean/mod.rs | 2 +- src/libsyntax/ast.rs | 2 +- src/libsyntax/fold.rs | 4 ++-- src/libsyntax/parse/parser.rs | 4 ++-- src/libsyntax/print/pprust.rs | 2 +- src/libsyntax/visit.rs | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) (limited to 'src/libsyntax/parse') diff --git a/src/librustc/hir/intravisit.rs b/src/librustc/hir/intravisit.rs index 001a5f6e586..7527d7fb318 100644 --- a/src/librustc/hir/intravisit.rs +++ b/src/librustc/hir/intravisit.rs @@ -566,7 +566,7 @@ pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty) { visitor.visit_ty(ty); visitor.visit_nested_body(length) } - TyObjectSum(ref bounds) => { + TyTraitObject(ref bounds) => { walk_list!(visitor, visit_ty_param_bound, bounds); } TyImplTrait(ref bounds) => { diff --git a/src/librustc/hir/lowering.rs b/src/librustc/hir/lowering.rs index ee6f91bd414..57f40e7140e 100644 --- a/src/librustc/hir/lowering.rs +++ b/src/librustc/hir/lowering.rs @@ -317,8 +317,8 @@ impl<'a> LoweringContext<'a> { let expr = self.lower_expr(expr); hir::TyTypeof(self.record_body(expr, None)) } - TyKind::ObjectSum(ref bounds) => { - hir::TyObjectSum(self.lower_bounds(bounds)) + TyKind::TraitObject(ref bounds) => { + hir::TyTraitObject(self.lower_bounds(bounds)) } TyKind::ImplTrait(ref bounds) => { hir::TyImplTrait(self.lower_bounds(bounds)) diff --git a/src/librustc/hir/mod.rs b/src/librustc/hir/mod.rs index c3ae0e3f276..b631d67e473 100644 --- a/src/librustc/hir/mod.rs +++ b/src/librustc/hir/mod.rs @@ -1216,7 +1216,7 @@ pub enum Ty_ { TyPath(QPath), /// A trait object type `Bound1 + Bound2 + Bound3` /// where `Bound` is a trait or a lifetime. - TyObjectSum(TyParamBounds), + TyTraitObject(TyParamBounds), /// An `impl Bound1 + Bound2 + Bound3` type /// where `Bound` is a trait or a lifetime. TyImplTrait(TyParamBounds), diff --git a/src/librustc/hir/print.rs b/src/librustc/hir/print.rs index c314145721f..377f2ea26ab 100644 --- a/src/librustc/hir/print.rs +++ b/src/librustc/hir/print.rs @@ -418,7 +418,7 @@ impl<'a> State<'a> { hir::TyPath(ref qpath) => { self.print_qpath(qpath, false)? } - hir::TyObjectSum(ref bounds) => { + hir::TyTraitObject(ref bounds) => { self.print_bounds("", &bounds[..])?; } hir::TyImplTrait(ref bounds) => { diff --git a/src/librustc_incremental/calculate_svh/svh_visitor.rs b/src/librustc_incremental/calculate_svh/svh_visitor.rs index c2abba5cce3..f0e86e81c07 100644 --- a/src/librustc_incremental/calculate_svh/svh_visitor.rs +++ b/src/librustc_incremental/calculate_svh/svh_visitor.rs @@ -456,7 +456,7 @@ fn saw_ty(node: &Ty_) -> SawTyComponent { TyNever => SawTyNever, TyTup(..) => SawTyTup, TyPath(_) => SawTyPath, - TyObjectSum(..) => SawTyObjectSum, + TyTraitObject(..) => SawTyObjectSum, TyImplTrait(..) => SawTyImplTrait, TyTypeof(..) => SawTyTypeof, TyInfer => SawTyInfer diff --git a/src/librustc_passes/ast_validation.rs b/src/librustc_passes/ast_validation.rs index e38fcbb5f6b..b7b027102b2 100644 --- a/src/librustc_passes/ast_validation.rs +++ b/src/librustc_passes/ast_validation.rs @@ -143,7 +143,7 @@ impl<'a> Visitor<'a> for AstValidator<'a> { err.emit(); }); } - TyKind::ObjectSum(ref bounds) => { + TyKind::TraitObject(ref bounds) => { self.no_questions_in_bounds(bounds, "trait object types", false); } _ => {} diff --git a/src/librustc_typeck/astconv.rs b/src/librustc_typeck/astconv.rs index bcb82c85f24..e4529b58f03 100644 --- a/src/librustc_typeck/astconv.rs +++ b/src/librustc_typeck/astconv.rs @@ -1347,7 +1347,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { match path.def { Def::Trait(trait_def_id) => { // N.B. this case overlaps somewhat with - // TyObjectSum, see that fn for details + // TyTraitObject, see that fn for details assert_eq!(opt_self_ty, None); tcx.prohibit_type_params(path.segments.split_last().unwrap().1); @@ -1525,7 +1525,7 @@ impl<'o, 'gcx: 'tcx, 'tcx> AstConv<'gcx, 'tcx>+'o { } tcx.mk_fn_ptr(bare_fn_ty) } - hir::TyObjectSum(ref bounds) => { + hir::TyTraitObject(ref bounds) => { self.conv_object_ty_poly_trait_ref(rscope, ast_ty.span, bounds) } hir::TyImplTrait(ref bounds) => { diff --git a/src/librustdoc/clean/mod.rs b/src/librustdoc/clean/mod.rs index 77ca6ef34b8..a77485477b1 100644 --- a/src/librustdoc/clean/mod.rs +++ b/src/librustdoc/clean/mod.rs @@ -1765,7 +1765,7 @@ impl Clean for hir::Ty { trait_: box resolve_type(cx, trait_path.clean(cx), self.id) } } - TyObjectSum(ref bounds) => { + TyTraitObject(ref bounds) => { let lhs_ty = bounds[0].clean(cx); match lhs_ty { TraitBound(poly_trait, ..) => { diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 2d7dfe50415..62cef26b6d1 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -1359,7 +1359,7 @@ pub enum TyKind { Path(Option, Path), /// A trait object type `Bound1 + Bound2 + Bound3` /// where `Bound` is a trait or a lifetime. - ObjectSum(TyParamBounds), + TraitObject(TyParamBounds), /// An `impl Bound1 + Bound2 + Bound3` type /// where `Bound` is a trait or a lifetime. ImplTrait(TyParamBounds), diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 2acf1c8f8fb..f936fc79991 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -386,8 +386,8 @@ pub fn noop_fold_ty(t: P, fld: &mut T) -> P { TyKind::Typeof(expr) => { TyKind::Typeof(fld.fold_expr(expr)) } - TyKind::ObjectSum(bounds) => { - TyKind::ObjectSum(bounds.move_map(|b| fld.fold_ty_param_bound(b))) + TyKind::TraitObject(bounds) => { + TyKind::TraitObject(bounds.move_map(|b| fld.fold_ty_param_bound(b))) } TyKind::ImplTrait(bounds) => { TyKind::ImplTrait(bounds.move_map(|b| fld.fold_ty_param_bound(b))) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 60ad6a76f4d..62897159bf0 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1045,7 +1045,7 @@ impl<'a> Parser<'a> { Some(TraitTyParamBound(poly_trait_ref, TraitBoundModifier::None)).into_iter() .chain(other_bounds) .collect(); - Ok(ast::TyKind::ObjectSum(all_bounds)) + Ok(ast::TyKind::TraitObject(all_bounds)) } } @@ -1327,7 +1327,7 @@ impl<'a> Parser<'a> { } let sp = mk_sp(lo, self.prev_span.hi); - let sum = TyKind::ObjectSum(bounds); + let sum = TyKind::TraitObject(bounds); Ok(P(Ty {id: ast::DUMMY_NODE_ID, node: sum, span: sp})) } diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index c989aa59e87..7115a38b448 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1028,7 +1028,7 @@ impl<'a> State<'a> { ast::TyKind::Path(Some(ref qself), ref path) => { self.print_qpath(path, qself, false)? } - ast::TyKind::ObjectSum(ref bounds) => { + ast::TyKind::TraitObject(ref bounds) => { self.print_bounds("", &bounds[..])?; } ast::TyKind::ImplTrait(ref bounds) => { diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index b0d7a251803..1a95e672f3c 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -346,7 +346,7 @@ pub fn walk_ty<'a, V: Visitor<'a>>(visitor: &mut V, typ: &'a Ty) { visitor.visit_ty(ty); visitor.visit_expr(expression) } - TyKind::ObjectSum(ref bounds) => { + TyKind::TraitObject(ref bounds) => { walk_list!(visitor, visit_ty_param_bound, bounds); } TyKind::ImplTrait(ref bounds) => { -- cgit 1.4.1-3-g733a5