From 66e0b65616816460b91877c1efbf0ce6a6ffd237 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Mon, 8 Feb 2016 12:44:45 +0100 Subject: [PATCH] [breaking batch] don't glob export ast::BlockCheckMode variants --- src/librustc_driver/pretty.rs | 4 ++-- src/librustc_front/lowering.rs | 4 ++-- src/libsyntax/ast.rs | 5 ++--- src/libsyntax/ext/build.rs | 5 ++--- src/libsyntax/parse/classify.rs | 4 ++-- src/libsyntax/parse/mod.rs | 2 +- src/libsyntax/parse/parser.rs | 14 +++++++------- src/libsyntax/print/pprust.rs | 8 ++++---- src/libsyntax_ext/deriving/generic/mod.rs | 4 ++-- 9 files changed, 24 insertions(+), 26 deletions(-) diff --git a/src/librustc_driver/pretty.rs b/src/librustc_driver/pretty.rs index 58043f385fedf..53438e3fca46a 100644 --- a/src/librustc_driver/pretty.rs +++ b/src/librustc_driver/pretty.rs @@ -30,7 +30,7 @@ use rustc_borrowck::graphviz as borrowck_dot; use rustc_resolve as resolve; use rustc_metadata::cstore::CStore; -use syntax::ast; +use syntax::ast::{self, BlockCheckMode}; use syntax::codemap; use syntax::fold::{self, Folder}; use syntax::print::{pp, pprust}; @@ -651,7 +651,7 @@ impl fold::Folder for ReplaceBodyWithLoop { if !self.within_static_or_const { - let empty_block = expr_to_block(ast::DefaultBlock, None); + let empty_block = expr_to_block(BlockCheckMode::Default, None); let loop_expr = P(ast::Expr { node: ast::ExprLoop(empty_block, None), id: ast::DUMMY_NODE_ID, diff --git a/src/librustc_front/lowering.rs b/src/librustc_front/lowering.rs index f634283114325..749020d9bae8d 100644 --- a/src/librustc_front/lowering.rs +++ b/src/librustc_front/lowering.rs @@ -1571,8 +1571,8 @@ pub fn lower_visibility(_lctx: &LoweringContext, v: Visibility) -> hir::Visibili pub fn lower_block_check_mode(lctx: &LoweringContext, b: &BlockCheckMode) -> hir::BlockCheckMode { match *b { - DefaultBlock => hir::DefaultBlock, - UnsafeBlock(u) => hir::UnsafeBlock(lower_unsafe_source(lctx, u)), + BlockCheckMode::Default => hir::DefaultBlock, + BlockCheckMode::Unsafe(u) => hir::UnsafeBlock(lower_unsafe_source(lctx, u)), } } diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 088f911ed8c44..a9445a615012f 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -11,7 +11,6 @@ // The Rust abstract syntax tree. pub use self::BinOp_::*; -pub use self::BlockCheckMode::*; pub use self::CaptureClause::*; pub use self::Decl_::*; pub use self::ExplicitSelf_::*; @@ -871,8 +870,8 @@ pub type SpannedIdent = Spanned; #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)] pub enum BlockCheckMode { - DefaultBlock, - UnsafeBlock(UnsafeSource), + Default, + Unsafe(UnsafeSource), } #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)] diff --git a/src/libsyntax/ext/build.rs b/src/libsyntax/ext/build.rs index a74c2340cecb8..04bfd8f77993e 100644 --- a/src/libsyntax/ext/build.rs +++ b/src/libsyntax/ext/build.rs @@ -9,8 +9,7 @@ // except according to those terms. use abi; -use ast::{Ident, Generics, Expr}; -use ast; +use ast::{self, Ident, Generics, Expr, BlockCheckMode}; use attr; use codemap::{Span, respan, Spanned, DUMMY_SP, Pos}; use ext::base::ExtCtxt; @@ -574,7 +573,7 @@ impl<'a> AstBuilder for ExtCtxt<'a> { stmts: stmts, expr: expr, id: ast::DUMMY_NODE_ID, - rules: ast::DefaultBlock, + rules: BlockCheckMode::Default, span: span, }) } diff --git a/src/libsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs index 1193224bdb625..ef50b3adad3ff 100644 --- a/src/libsyntax/parse/classify.rs +++ b/src/libsyntax/parse/classify.rs @@ -12,7 +12,7 @@ // Predicates on exprs and stmts that the pretty-printer and parser use -use ast; +use ast::{self, BlockCheckMode}; /// Does this expression require a semicolon to be treated /// as a statement? The negation of this: 'can this expression @@ -37,7 +37,7 @@ pub fn expr_requires_semi_to_be_stmt(e: &ast::Expr) -> bool { pub fn expr_is_simple_block(e: &ast::Expr) -> bool { match e.node { - ast::ExprBlock(ref block) => block.rules == ast::DefaultBlock, + ast::ExprBlock(ref block) => block.rules == BlockCheckMode::Default, _ => false, } } diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs index 32372ccc13b47..7d3dbb0562603 100644 --- a/src/libsyntax/parse/mod.rs +++ b/src/libsyntax/parse/mod.rs @@ -988,7 +988,7 @@ mod tests { span: sp(17,19)})), expr: None, id: ast::DUMMY_NODE_ID, - rules: ast::DefaultBlock, // no idea + rules: ast::BlockCheckMode::Default, // no idea span: sp(15,21), })), vis: ast::Inherited, diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index bff5071b8ec10..a55b6656318e8 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -18,7 +18,7 @@ use ast::{Mod, BiAdd, Arg, Arm, Attribute, BindingMode}; use ast::{BiBitAnd, BiBitOr, BiBitXor, BiRem, BiLt, Block}; use ast::{BlockCheckMode, CaptureByRef, CaptureByValue, CaptureClause}; use ast::{Constness, ConstTraitItem, Crate, CrateConfig}; -use ast::{Decl, DeclItem, DeclLocal, DefaultBlock, DefaultReturn}; +use ast::{Decl, DeclItem, DeclLocal, DefaultReturn}; use ast::{UnDeref, BiDiv, EMPTY_CTXT, EnumDef, ExplicitSelf}; use ast::{Expr, Expr_, ExprAddrOf, ExprMatch, ExprAgain}; use ast::{ExprAssign, ExprAssignOp, ExprBinary, ExprBlock, ExprBox}; @@ -53,7 +53,7 @@ use ast::{TyFixedLengthVec, TyBareFn, TyTypeof, TyInfer}; use ast::{TyParam, TyParamBounds, TyParen, TyPath, TyPtr}; use ast::{TyRptr, TyTup, TyU32, TyVec}; use ast::TypeTraitItem; -use ast::{UnnamedField, UnsafeBlock}; +use ast::UnnamedField; use ast::{ViewPath, ViewPathGlob, ViewPathList, ViewPathSimple}; use ast::{Visibility, WhereClause}; use attr::{ThinAttributes, ThinAttributesExt, AttributesExt}; @@ -2095,7 +2095,7 @@ impl<'a> Parser<'a> { } }, token::OpenDelim(token::Brace) => { - return self.parse_block_expr(lo, DefaultBlock, attrs); + return self.parse_block_expr(lo, BlockCheckMode::Default, attrs); }, token::BinOp(token::Or) | token::OrOr => { let lo = self.span.lo; @@ -2211,7 +2211,7 @@ impl<'a> Parser<'a> { if self.eat_keyword(keywords::Unsafe) { return self.parse_block_expr( lo, - UnsafeBlock(ast::UserProvided), + BlockCheckMode::Unsafe(ast::UserProvided), attrs); } if self.eat_keyword(keywords::Return) { @@ -3053,7 +3053,7 @@ impl<'a> Parser<'a> { stmts: vec![], span: body_expr.span, expr: Some(body_expr), - rules: DefaultBlock, + rules: BlockCheckMode::Default, }) } _ => { @@ -3817,7 +3817,7 @@ impl<'a> Parser<'a> { "place this code inside a block")); } - self.parse_block_tail(lo, DefaultBlock) + self.parse_block_tail(lo, BlockCheckMode::Default) } /// Parse a block. Inner attrs are allowed. @@ -3827,7 +3827,7 @@ impl<'a> Parser<'a> { let lo = self.span.lo; try!(self.expect(&token::OpenDelim(token::Brace))); Ok((try!(self.parse_inner_attributes()), - try!(self.parse_block_tail(lo, DefaultBlock)))) + try!(self.parse_block_tail(lo, BlockCheckMode::Default)))) } /// Parse the rest of a block expression or function body diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 759b16c5738f3..102dde15dfd2f 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -11,7 +11,7 @@ pub use self::AnnNode::*; use abi; -use ast::{self, TokenTree}; +use ast::{self, TokenTree, BlockCheckMode}; use ast::{RegionTyParamBound, TraitTyParamBound, TraitBoundModifier}; use ast::Attribute; use attr::ThinAttributesExt; @@ -1684,8 +1684,8 @@ impl<'a> State<'a> { attrs: &[ast::Attribute], close_box: bool) -> io::Result<()> { match blk.rules { - ast::UnsafeBlock(..) => try!(self.word_space("unsafe")), - ast::DefaultBlock => () + BlockCheckMode::Unsafe(..) => try!(self.word_space("unsafe")), + BlockCheckMode::Default => () } try!(self.maybe_print_comment(blk.span.lo)); try!(self.ann.pre(self, NodeBlock(blk))); @@ -2610,7 +2610,7 @@ impl<'a> State<'a> { try!(self.print_block_unclosed_indent(&**blk, INDENT_UNIT)); // If it is a user-provided unsafe block, print a comma after it - if let ast::UnsafeBlock(ast::UserProvided) = blk.rules { + if let BlockCheckMode::Unsafe(ast::UserProvided) = blk.rules { try!(word(&mut self.s, ",")); } } diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 3af701739b431..e39c4b771028e 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -1267,7 +1267,7 @@ impl<'a> MethodDef<'a> { stmts: vec![], expr: Some(call), id: ast::DUMMY_NODE_ID, - rules: ast::UnsafeBlock(ast::CompilerGenerated), + rules: ast::BlockCheckMode::Unsafe(ast::CompilerGenerated), span: sp })); let target_ty = cx.ty_ident(sp, cx.ident_of(target_type_name)); @@ -1302,7 +1302,7 @@ impl<'a> MethodDef<'a> { stmts: vec![], expr: Some(call), id: ast::DUMMY_NODE_ID, - rules: ast::UnsafeBlock(ast::CompilerGenerated), + rules: ast::BlockCheckMode::Unsafe(ast::CompilerGenerated), span: sp })); match_arms.push(cx.arm(sp, vec![cx.pat_wild(sp)], unreachable));