diff options
| author | bors <bors@rust-lang.org> | 2014-03-07 01:01:40 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-07 01:01:40 -0800 |
| commit | b1d104c644cb023d32bfb8c016110b1787c564ba (patch) | |
| tree | 686f5482498de9102d17da6ad42c0a9f98f954b0 /src/libsyntax/parse | |
| parent | 85ab68eed04ed22e7d45c34901d2e0284e2061ad (diff) | |
| parent | 2271860af1c7f2a5aca03fa8ccbde6ad9f6798f5 (diff) | |
| download | rust-b1d104c644cb023d32bfb8c016110b1787c564ba.tar.gz rust-b1d104c644cb023d32bfb8c016110b1787c564ba.zip | |
auto merge of #12750 : liigo/rust/De-extern-mod, r=alexcrichton
rename ast::ViewItemExternMod to ast::ViewItemExternCrate rename rustdoc::clean::ExternMod to rustdoc::clean::ExternCrate because `extern mod` is out.
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 341151117f0..6fbf5f071ad 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -55,7 +55,7 @@ use ast::{TyInfer, TypeMethod}; use ast::{TyNil, TyParam, TyParamBound, TyPath, TyPtr, TyRptr}; use ast::{TyTup, TyU32, TyUniq, TyVec, UnUniq}; use ast::{UnnamedField, UnsafeBlock, UnsafeFn, ViewItem}; -use ast::{ViewItem_, ViewItemExternMod, ViewItemUse}; +use ast::{ViewItem_, ViewItemExternCrate, ViewItemUse}; use ast::{ViewPath, ViewPathGlob, ViewPathList, ViewPathSimple}; use ast::Visibility; use ast; @@ -4361,7 +4361,7 @@ impl Parser { }; IoviViewItem(ast::ViewItem { - node: ViewItemExternMod(ident, maybe_path, ast::DUMMY_NODE_ID), + node: ViewItemExternCrate(ident, maybe_path, ast::DUMMY_NODE_ID), attrs: attrs, vis: visibility, span: mk_sp(lo, self.last_span.hi) @@ -5017,11 +5017,11 @@ impl Parser { // `extern crate` must precede `use`. extern_mod_allowed = false; } - ViewItemExternMod(..) if !extern_mod_allowed => { + ViewItemExternCrate(..) if !extern_mod_allowed => { self.span_err(view_item.span, "\"extern crate\" declarations are not allowed here"); } - ViewItemExternMod(..) => {} + ViewItemExternCrate(..) => {} } view_items.push(view_item); } |
