From d1a57e479c13804e1cda5658f482e840c3a1cd79 Mon Sep 17 00:00:00 2001 From: Eduard Burtescu Date: Wed, 1 Oct 2014 00:59:56 +0300 Subject: syntax: ast: remove TyBox and UnBox. --- src/libsyntax/ast.rs | 2 -- src/libsyntax/ast_util.rs | 1 - src/libsyntax/ext/build.rs | 5 ----- src/libsyntax/feature_gate.rs | 12 ------------ src/libsyntax/fold.rs | 1 - src/libsyntax/parse/parser.rs | 9 ++++----- src/libsyntax/print/pprust.rs | 4 ---- src/libsyntax/visit.rs | 2 +- 8 files changed, 5 insertions(+), 31 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 59c824d0eae..0a87c0a344e 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -416,7 +416,6 @@ pub enum BinOp { #[deriving(Clone, PartialEq, Eq, Encodable, Decodable, Hash, Show)] pub enum UnOp { - UnBox, UnUniq, UnDeref, UnNot, @@ -953,7 +952,6 @@ pub struct UnboxedFnTy { pub enum Ty_ { TyNil, TyBot, /* bottom type */ - TyBox(P), TyUniq(P), TyVec(P), TyFixedLengthVec(P, P), diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs index 6d61c851476..31860062580 100644 --- a/src/libsyntax/ast_util.rs +++ b/src/libsyntax/ast_util.rs @@ -90,7 +90,6 @@ pub fn is_shift_binop(b: BinOp) -> bool { pub fn unop_to_string(op: UnOp) -> &'static str { match op { - UnBox => "box(GC) ", UnUniq => "box() ", UnDeref => "*", UnNot => "!", diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index f2b806f43cc..1fdb6dd505f 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -112,7 +112,6 @@ pub trait AstBuilder { fn expr_deref(&self, sp: Span, e: P) -> P; fn expr_unary(&self, sp: Span, op: ast::UnOp, e: P) -> P; - fn expr_managed(&self, sp: Span, e: P) -> P; fn expr_addr_of(&self, sp: Span, e: P) -> P; fn expr_mut_addr_of(&self, sp: Span, e: P) -> P; fn expr_field_access(&self, span: Span, expr: P, ident: ast::Ident) -> P; @@ -565,10 +564,6 @@ impl<'a> AstBuilder for ExtCtxt<'a> { self.expr(sp, ast::ExprUnary(op, e)) } - fn expr_managed(&self, sp: Span, e: P) -> P { - self.expr_unary(sp, ast::UnBox, e) - } - fn expr_field_access(&self, sp: Span, expr: P, ident: ast::Ident) -> P { let field_name = token::get_ident(ident); let field_span = Span { diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 38de2a9c284..8565bebe269 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -136,14 +136,6 @@ impl<'a> Context<'a> { } } - fn gate_box(&self, span: Span) { - self.gate_feature("managed_boxes", span, - "The managed box syntax is being replaced by the \ - `std::gc::Gc` and `std::rc::Rc` types. Equivalent \ - functionality to managed trait objects will be \ - implemented but is currently missing."); - } - fn has_feature(&self, feature: &str) -> bool { self.features.iter().any(|n| n.as_slice() == feature) } @@ -331,7 +323,6 @@ impl<'a, 'v> Visitor<'v> for Context<'a> { experimental and likely to be removed"); }, - ast::TyBox(_) => { self.gate_box(t.span); } ast::TyUnboxedFn(..) => { self.gate_feature("unboxed_closure_sugar", t.span, @@ -345,9 +336,6 @@ impl<'a, 'v> Visitor<'v> for Context<'a> { fn visit_expr(&mut self, e: &ast::Expr) { match e.node { - ast::ExprUnary(ast::UnBox, _) => { - self.gate_box(e.span); - } ast::ExprUnboxedFn(..) => { self.gate_feature("unboxed_closures", e.span, diff --git a/src/libsyntax/fold.rs b/src/libsyntax/fold.rs index 31bec58a4da..84de6c3b913 100644 --- a/src/libsyntax/fold.rs +++ b/src/libsyntax/fold.rs @@ -372,7 +372,6 @@ pub fn noop_fold_ty(t: P, fld: &mut T) -> P { id: fld.new_id(id), node: match node { TyNil | TyBot | TyInfer => node, - TyBox(ty) => TyBox(fld.fold_ty(ty)), TyUniq(ty) => TyUniq(fld.fold_ty(ty)), TyVec(ty) => TyVec(fld.fold_ty(ty)), TyPtr(mt) => TyPtr(fld.fold_mt(mt)), diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index c8f1b7f9a8e..8082fd65f1a 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -16,8 +16,7 @@ use ast::{RegionTyParamBound, TraitTyParamBound}; use ast::{ProvidedMethod, Public, FnStyle}; use ast::{Mod, BiAdd, Arg, Arm, Attribute, BindByRef, BindByValue}; use ast::{BiBitAnd, BiBitOr, BiBitXor, BiRem, Block}; -use ast::{BlockCheckMode, UnBox}; -use ast::{CaptureByRef, CaptureByValue, CaptureClause}; +use ast::{BlockCheckMode, CaptureByRef, CaptureByValue, CaptureClause}; use ast::{Crate, CrateConfig, Decl, DeclItem}; use ast::{DeclLocal, DefaultBlock, UnDeref, BiDiv, EMPTY_CTXT, EnumDef, ExplicitSelf}; use ast::{Expr, Expr_, ExprAddrOf, ExprMatch, ExprAgain}; @@ -50,7 +49,7 @@ use ast::{StructVariantKind, BiSub}; use ast::StrStyle; use ast::{SelfExplicit, SelfRegion, SelfStatic, SelfValue}; use ast::{TokenTree, TraitItem, TraitRef, TTDelim, TTSeq, TTTok}; -use ast::{TTNonterminal, TupleVariantKind, Ty, Ty_, TyBot, TyBox}; +use ast::{TTNonterminal, TupleVariantKind, Ty, Ty_, TyBot}; use ast::{TypeField, TyFixedLengthVec, TyClosure, TyProc, TyBareFn}; use ast::{TyTypeof, TyInfer, TypeMethod}; use ast::{TyNil, TyParam, TyParamBound, TyParen, TyPath, TyPtr, TyQPath}; @@ -1455,7 +1454,7 @@ impl<'a> Parser<'a> { self.bump(); let span = self.last_span; self.obsolete(span, ObsoleteManagedType); - TyBox(self.parse_ty(plus_allowed)) + TyUniq(self.parse_ty(plus_allowed)) } else if self.token == token::TILDE { // OWNED POINTER self.bump(); @@ -2729,7 +2728,7 @@ impl<'a> Parser<'a> { self.obsolete(span, ObsoleteManagedExpr); let e = self.parse_prefix_expr(); hi = e.span.hi; - ex = self.mk_unary(UnBox, e); + ex = self.mk_unary(UnUniq, e); } token::TILDE => { self.bump(); diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index a8e99b4e85f..8400d9aea3b 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -546,10 +546,6 @@ impl<'a> State<'a> { match ty.node { ast::TyNil => try!(word(&mut self.s, "()")), ast::TyBot => try!(word(&mut self.s, "!")), - ast::TyBox(ref ty) => { - try!(word(&mut self.s, "@")); - try!(self.print_type(&**ty)); - } ast::TyUniq(ref ty) => { try!(word(&mut self.s, "~")); try!(self.print_type(&**ty)); diff --git a/src/libsyntax/visit.rs b/src/libsyntax/visit.rs index 6fc79e2c42a..249f87d3102 100644 --- a/src/libsyntax/visit.rs +++ b/src/libsyntax/visit.rs @@ -326,7 +326,7 @@ pub fn skip_ty<'v, V: Visitor<'v>>(_: &mut V, _: &'v Ty) { pub fn walk_ty<'v, V: Visitor<'v>>(visitor: &mut V, typ: &'v Ty) { match typ.node { - TyUniq(ref ty) | TyVec(ref ty) | TyBox(ref ty) | TyParen(ref ty) => { + TyUniq(ref ty) | TyVec(ref ty) | TyParen(ref ty) => { visitor.visit_ty(&**ty) } TyPtr(ref mutable_type) => { -- cgit 1.4.1-3-g733a5