Skip to content

Commit 0e87039

Browse files
committed
rustc: Remove the rustsyntax::attr wrapper in front
1 parent ba69a73 commit 0e87039

File tree

21 files changed

+22
-25
lines changed

21 files changed

+22
-25
lines changed

src/rustc/back/link.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import libc::{c_int, c_uint};
22
import driver::session;
33
import session::session;
44
import lib::llvm::llvm;
5-
import front::attr;
5+
import syntax::attr;
66
import middle::ty;
77
import metadata::{encoder, cstore};
88
import middle::trans::common::crate_ctxt;

src/rustc/driver/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import metadata::{creader, cstore};
33
import session::session;
44
import syntax::parse::{parser};
55
import syntax::{ast, codemap};
6-
import front::attr;
6+
import syntax::attr;
77
import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage,
88
last_use, lint};
99
import syntax::print::{pp, pprust};

src/rustc/driver/session.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ fn building_library(req_crate_type: crate_type, crate: @ast::crate,
130130
if testing {
131131
false
132132
} else {
133-
alt front::attr::get_meta_item_value_str_by_name(
133+
alt syntax::attr::get_meta_item_value_str_by_name(
134134
crate.node.attrs,
135135
"crate_type") {
136136
option::some("lib") { true }

src/rustc/front.rs

Lines changed: 0 additions & 6 deletions
This file was deleted.

src/rustc/front/config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import syntax::{ast, fold};
1+
import syntax::{ast, fold, attr};
22

33
export strip_unconfigured_items;
44
export metas_in_cfg;

src/rustc/front/core_inject.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import driver::session::session;
22
import syntax::codemap;
33
import syntax::ast;
4-
import front::attr;
4+
import syntax::attr;
55

66
export maybe_inject_libcore_ref;
77

src/rustc/front/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import syntax::print::pprust;
88
import syntax::codemap::span;
99
import driver::session;
1010
import session::session;
11-
import front::attr;
11+
import syntax::attr;
1212

1313
export modify_for_testing;
1414

src/rustc/metadata/creader.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import driver::session;
44
import session::session;
55
import syntax::{ast, ast_util};
66
import lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
7-
import front::attr;
7+
import syntax::attr;
88
import syntax::visit;
99
import syntax::codemap::span;
1010
import util::{filesearch};

src/rustc/metadata/decoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import std::map::hashmap;
55
import io::writer_util;
66
import syntax::{ast, ast_util};
77
import driver::session::session;
8-
import front::attr;
8+
import syntax::attr;
99
import middle::ty;
1010
import middle::ast_map;
1111
import common::*;

src/rustc/metadata/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import middle::trans::common::crate_ctxt;
1313
import middle::ty;
1414
import middle::ty::node_id_to_type;
1515
import middle::ast_map;
16-
import front::attr;
16+
import syntax::attr;
1717
import driver::session::session;
1818
import std::serialization::serializer;
1919

src/rustc/middle/ast_map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import syntax::ast_util;
55
import syntax::ast_util::inlined_item_methods;
66
import syntax::{visit, codemap};
77
import driver::session::session;
8-
import front::attr;
8+
import syntax::attr;
99

1010
enum path_elt { path_mod(str), path_name(str) }
1111
type path = [path_elt];

src/rustc/middle/lint.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import driver::session::session;
22
import middle::ty::ctxt;
33
import syntax::{ast, visit};
4-
import front::attr;
4+
import syntax::attr;
55
import std::map::hashmap;
66
import io::writer_util;
77

src/rustc/middle/resolve.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ast::{ident, fn_ident, def, def_id, node_id};
44
import syntax::ast_util::{local_def, def_id_of_def, class_item_ident};
55
import pat_util::*;
66

7-
import front::attr;
7+
import syntax::attr;
88
import metadata::{csearch, cstore};
99
import driver::session::session;
1010
import util::common::*;

src/rustc/middle/trans/base.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import std::map::hashmap;
1919
import std::map::{int_hash, str_hash};
2020
import driver::session;
2121
import session::session;
22-
import front::attr;
22+
import syntax::attr;
2323
import back::{link, abi, upcall};
2424
import syntax::{ast, ast_util, codemap};
2525
import ast_util::inlined_item_methods;

src/rustc/middle/trans/native.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import driver::session::{session, arch_x86_64};
22
import syntax::codemap::span;
33
import libc::c_uint;
4-
import front::attr;
4+
import syntax::attr;
55
import lib::llvm::{ llvm, TypeRef, ValueRef,
66
ModuleRef, CallConv, Attribute,
77
StructRetAttribute, ByValAttribute

src/rustc/middle/trans/reachable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import syntax::ast::*;
99
import syntax::{visit, ast_util};
1010
import syntax::ast_util::def_id_of_def;
11-
import front::attr;
11+
import syntax::attr;
1212
import std::map::hashmap;
1313

1414
export map, find_reachable;

src/rustc/middle/typeck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -987,7 +987,7 @@ mod collect {
987987
// These don't define types.
988988
ast::item_mod(_) {}
989989
ast::item_native_mod(m) {
990-
if front::attr::native_abi(it.attrs) ==
990+
if syntax::attr::native_abi(it.attrs) ==
991991
either::right(ast::native_abi_rust_intrinsic) {
992992
for item in m.items { check_intrinsic_type(tcx, item); }
993993
}

src/rustc/syntax.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,7 @@ export parse;
2323
import rustsyntax::util;
2424
export util;
2525

26+
import rustsyntax::attr;
27+
export attr;
28+
2629
export ext;

src/rustc/syntax/ext/auto_serialize.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ import base::*;
7373
import codemap::span;
7474
import std::map;
7575
import std::map::hashmap;
76-
import front::attr;
76+
import syntax::attr;
7777

7878
export expand;
7979

src/rustc/syntax/ext/expand.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import driver::session::session;
33

44
import std::map::hashmap;
55

6-
import front::attr;
6+
import syntax::attr;
77

88
import syntax::ast::{crate, expr_, expr_mac, mac_invoc};
99
import syntax::fold::*;

src/rustdoc/attr_parser.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
)];
77

88
import rustc::syntax::ast;
9-
import rustc::front::attr;
9+
import rustc::syntax::attr;
1010
import core::tuple;
1111

1212
export crate_attrs;

0 commit comments

Comments
 (0)