rustc: Remove the rustsyntax::attr wrapper in front

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;

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};

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 }

src/rustc/front.rs

@@ -1,6 +0,0 @@
-import rustsyntax::attr;
-export attr;
-
-export config;
-export test;
-export core_inject;

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;

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;
 

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;
 

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};

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::*;

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;
 

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];

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;
 

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::*;

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;

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

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;

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); }
             }

src/rustc/syntax.rs

@@ -23,4 +23,7 @@ export parse;
 import rustsyntax::util;
 export util;
 
+import rustsyntax::attr;
+export attr;
+
 export ext;

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;
 

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::*;

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;