diff --git a/src/rustc/back/link.rs b/src/rustc/back/link.rs index 3ef65a44a14..28bfcc04c4c 100644 --- a/src/rustc/back/link.rs +++ b/src/rustc/back/link.rs @@ -2,7 +2,7 @@ import libc::{c_int, c_uint}; import driver::session; import session::session; import lib::llvm::llvm; -import front::attr; +import syntax::attr; import middle::ty; import metadata::{encoder, cstore}; import middle::trans::common::crate_ctxt; diff --git a/src/rustc/driver/driver.rs b/src/rustc/driver/driver.rs index c6b503a3fdf..cde545abfca 100644 --- a/src/rustc/driver/driver.rs +++ b/src/rustc/driver/driver.rs @@ -3,7 +3,7 @@ import metadata::{creader, cstore}; import session::session; import syntax::parse::{parser}; import syntax::{ast, codemap}; -import front::attr; +import syntax::attr; import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage, last_use, lint}; import syntax::print::{pp, pprust}; diff --git a/src/rustc/driver/session.rs b/src/rustc/driver/session.rs index 5d24eb1f46f..03675b74d1b 100644 --- a/src/rustc/driver/session.rs +++ b/src/rustc/driver/session.rs @@ -130,7 +130,7 @@ fn building_library(req_crate_type: crate_type, crate: @ast::crate, if testing { false } else { - alt front::attr::get_meta_item_value_str_by_name( + alt syntax::attr::get_meta_item_value_str_by_name( crate.node.attrs, "crate_type") { option::some("lib") { true } diff --git a/src/rustc/front.rs b/src/rustc/front.rs deleted file mode 100644 index f94decc900b..00000000000 --- a/src/rustc/front.rs +++ /dev/null @@ -1,6 +0,0 @@ -import rustsyntax::attr; -export attr; - -export config; -export test; -export core_inject; diff --git a/src/rustc/front/config.rs b/src/rustc/front/config.rs index 44c88739069..9d0f9e3d3f0 100644 --- a/src/rustc/front/config.rs +++ b/src/rustc/front/config.rs @@ -1,4 +1,4 @@ -import syntax::{ast, fold}; +import syntax::{ast, fold, attr}; export strip_unconfigured_items; export metas_in_cfg; diff --git a/src/rustc/front/core_inject.rs b/src/rustc/front/core_inject.rs index b21967721c5..179d560f1c7 100644 --- a/src/rustc/front/core_inject.rs +++ b/src/rustc/front/core_inject.rs @@ -1,7 +1,7 @@ import driver::session::session; import syntax::codemap; import syntax::ast; -import front::attr; +import syntax::attr; export maybe_inject_libcore_ref; diff --git a/src/rustc/front/test.rs b/src/rustc/front/test.rs index d39936c10cc..a9b36812bc8 100644 --- a/src/rustc/front/test.rs +++ b/src/rustc/front/test.rs @@ -8,7 +8,7 @@ import syntax::print::pprust; import syntax::codemap::span; import driver::session; import session::session; -import front::attr; +import syntax::attr; export modify_for_testing; diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs index 5d8cf74d2f8..1a38f04ef74 100644 --- a/src/rustc/metadata/creader.rs +++ b/src/rustc/metadata/creader.rs @@ -4,7 +4,7 @@ import driver::session; import session::session; import syntax::{ast, ast_util}; import lib::llvm::{False, llvm, mk_object_file, mk_section_iter}; -import front::attr; +import syntax::attr; import syntax::visit; import syntax::codemap::span; import util::{filesearch}; diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs index 2c881260ffd..bb6c4d5dc3d 100644 --- a/src/rustc/metadata/decoder.rs +++ b/src/rustc/metadata/decoder.rs @@ -5,7 +5,7 @@ import std::map::hashmap; import io::writer_util; import syntax::{ast, ast_util}; import driver::session::session; -import front::attr; +import syntax::attr; import middle::ty; import middle::ast_map; import common::*; diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs index e8b12763160..ba9768f5a1a 100644 --- a/src/rustc/metadata/encoder.rs +++ b/src/rustc/metadata/encoder.rs @@ -13,7 +13,7 @@ import middle::trans::common::crate_ctxt; import middle::ty; import middle::ty::node_id_to_type; import middle::ast_map; -import front::attr; +import syntax::attr; import driver::session::session; import std::serialization::serializer; diff --git a/src/rustc/middle/ast_map.rs b/src/rustc/middle/ast_map.rs index ee91b573daa..18a7f42f332 100644 --- a/src/rustc/middle/ast_map.rs +++ b/src/rustc/middle/ast_map.rs @@ -5,7 +5,7 @@ import syntax::ast_util; import syntax::ast_util::inlined_item_methods; import syntax::{visit, codemap}; import driver::session::session; -import front::attr; +import syntax::attr; enum path_elt { path_mod(str), path_name(str) } type path = [path_elt]; diff --git a/src/rustc/middle/lint.rs b/src/rustc/middle/lint.rs index 3ccbaed873c..47e1de31229 100644 --- a/src/rustc/middle/lint.rs +++ b/src/rustc/middle/lint.rs @@ -1,7 +1,7 @@ import driver::session::session; import middle::ty::ctxt; import syntax::{ast, visit}; -import front::attr; +import syntax::attr; import std::map::hashmap; import io::writer_util; diff --git a/src/rustc/middle/resolve.rs b/src/rustc/middle/resolve.rs index 3fe98999cef..961ef7084ed 100644 --- a/src/rustc/middle/resolve.rs +++ b/src/rustc/middle/resolve.rs @@ -4,7 +4,7 @@ import ast::{ident, fn_ident, def, def_id, node_id}; import syntax::ast_util::{local_def, def_id_of_def, class_item_ident}; import pat_util::*; -import front::attr; +import syntax::attr; import metadata::{csearch, cstore}; import driver::session::session; import util::common::*; diff --git a/src/rustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs index 26565b05b97..5047f5ae282 100644 --- a/src/rustc/middle/trans/base.rs +++ b/src/rustc/middle/trans/base.rs @@ -19,7 +19,7 @@ import std::map::hashmap; import std::map::{int_hash, str_hash}; import driver::session; import session::session; -import front::attr; +import syntax::attr; import back::{link, abi, upcall}; import syntax::{ast, ast_util, codemap}; import ast_util::inlined_item_methods; diff --git a/src/rustc/middle/trans/native.rs b/src/rustc/middle/trans/native.rs index 696861a4e1f..84486898fba 100644 --- a/src/rustc/middle/trans/native.rs +++ b/src/rustc/middle/trans/native.rs @@ -1,7 +1,7 @@ import driver::session::{session, arch_x86_64}; import syntax::codemap::span; import libc::c_uint; -import front::attr; +import syntax::attr; import lib::llvm::{ llvm, TypeRef, ValueRef, ModuleRef, CallConv, Attribute, StructRetAttribute, ByValAttribute diff --git a/src/rustc/middle/trans/reachable.rs b/src/rustc/middle/trans/reachable.rs index ca4ff733716..3eab2dc4144 100644 --- a/src/rustc/middle/trans/reachable.rs +++ b/src/rustc/middle/trans/reachable.rs @@ -8,7 +8,7 @@ import syntax::ast::*; import syntax::{visit, ast_util}; import syntax::ast_util::def_id_of_def; -import front::attr; +import syntax::attr; import std::map::hashmap; export map, find_reachable; diff --git a/src/rustc/middle/typeck.rs b/src/rustc/middle/typeck.rs index 5fde3ab75de..c538d11358d 100644 --- a/src/rustc/middle/typeck.rs +++ b/src/rustc/middle/typeck.rs @@ -987,7 +987,7 @@ mod collect { // These don't define types. ast::item_mod(_) {} ast::item_native_mod(m) { - if front::attr::native_abi(it.attrs) == + if syntax::attr::native_abi(it.attrs) == either::right(ast::native_abi_rust_intrinsic) { for item in m.items { check_intrinsic_type(tcx, item); } } diff --git a/src/rustc/syntax.rs b/src/rustc/syntax.rs index c55e61c8a03..08a038df59f 100644 --- a/src/rustc/syntax.rs +++ b/src/rustc/syntax.rs @@ -23,4 +23,7 @@ export parse; import rustsyntax::util; export util; +import rustsyntax::attr; +export attr; + export ext; diff --git a/src/rustc/syntax/ext/auto_serialize.rs b/src/rustc/syntax/ext/auto_serialize.rs index defb1f7b13c..678f745a155 100644 --- a/src/rustc/syntax/ext/auto_serialize.rs +++ b/src/rustc/syntax/ext/auto_serialize.rs @@ -73,7 +73,7 @@ import base::*; import codemap::span; import std::map; import std::map::hashmap; -import front::attr; +import syntax::attr; export expand; diff --git a/src/rustc/syntax/ext/expand.rs b/src/rustc/syntax/ext/expand.rs index b16e0c0a1a0..56241486501 100644 --- a/src/rustc/syntax/ext/expand.rs +++ b/src/rustc/syntax/ext/expand.rs @@ -3,7 +3,7 @@ import driver::session::session; import std::map::hashmap; -import front::attr; +import syntax::attr; import syntax::ast::{crate, expr_, expr_mac, mac_invoc}; import syntax::fold::*; diff --git a/src/rustdoc/attr_parser.rs b/src/rustdoc/attr_parser.rs index d410e3d3ab8..dd5c9ade7a2 100644 --- a/src/rustdoc/attr_parser.rs +++ b/src/rustdoc/attr_parser.rs @@ -6,7 +6,7 @@ )]; import rustc::syntax::ast; -import rustc::front::attr; +import rustc::syntax::attr; import core::tuple; export crate_attrs;