diff options
| author | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2016-02-08 15:34:47 +0100 |
|---|---|---|
| committer | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2016-02-11 12:34:48 +0100 |
| commit | 79fa657abc6b8885ceb4023099b4e0026c5ef28f (patch) | |
| tree | 47b5b4bada4def35e5da8f19b4af309f887c8421 /src/libsyntax/parse | |
| parent | 8516ba367d1f51318ce373fe9b60650c82ded1e9 (diff) | |
| download | rust-79fa657abc6b8885ceb4023099b4e0026c5ef28f.tar.gz rust-79fa657abc6b8885ceb4023099b4e0026c5ef28f.zip | |
[breaking-change] don't glob export ast::Decl_ variants
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/classify.rs | 4 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs index ef50b3adad3..82b8730e10f 100644 --- a/src/libsyntax/parse/classify.rs +++ b/src/libsyntax/parse/classify.rs @@ -49,8 +49,8 @@ pub fn stmt_ends_with_semi(stmt: &ast::Stmt_) -> bool { match *stmt { ast::StmtDecl(ref d, _) => { match d.node { - ast::DeclLocal(_) => true, - ast::DeclItem(_) => false, + ast::DeclKind::Local(_) => true, + ast::DeclKind::Item(_) => false, } } ast::StmtExpr(ref e, _) => expr_requires_semi_to_be_stmt(e), diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index c149f1f62b0..8bdd9a8f539 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -18,7 +18,7 @@ use ast::{Mod, Arg, Arm, Attribute, BindingMode}; use ast::Block; use ast::{BlockCheckMode, CaptureBy}; use ast::{Constness, ConstTraitItem, Crate, CrateConfig}; -use ast::{Decl, DeclItem, DeclLocal}; +use ast::{Decl, DeclKind}; use ast::{EMPTY_CTXT, EnumDef, ExplicitSelf}; use ast::{Expr, Expr_, ExprAddrOf, ExprMatch, ExprAgain}; use ast::{ExprAssign, ExprAssignOp, ExprBinary, ExprBlock, ExprBox}; @@ -3636,7 +3636,7 @@ impl<'a> Parser<'a> { fn parse_let(&mut self, attrs: ThinAttributes) -> PResult<'a, P<Decl>> { let lo = self.span.lo; let local = try!(self.parse_local(attrs)); - Ok(P(spanned(lo, self.last_span.hi, DeclLocal(local)))) + Ok(P(spanned(lo, self.last_span.hi, DeclKind::Local(local)))) } /// Parse a structure field @@ -3759,7 +3759,7 @@ impl<'a> Parser<'a> { } } spanned(lo, hi, StmtDecl( - P(spanned(lo, hi, DeclItem( + P(spanned(lo, hi, DeclKind::Item( self.mk_item( lo, hi, id /*id is good here*/, ItemMac(spanned(lo, hi, @@ -3772,7 +3772,7 @@ impl<'a> Parser<'a> { match try!(self.parse_item_(attrs.clone(), false, true)) { Some(i) => { let hi = i.span.hi; - let decl = P(spanned(lo, hi, DeclItem(i))); + let decl = P(spanned(lo, hi, DeclKind::Item(i))); spanned(lo, hi, StmtDecl(decl, ast::DUMMY_NODE_ID)) } None => { |
