Skip to content

Commit 04fa0e7

Browse files
committed
rustc_target: move in syntax::abi and flip dependency.
1 parent 030244c commit 04fa0e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+106
-77
lines changed

src/Cargo.lock

Lines changed: 9 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/librustc/hir/intravisit.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
//! This order consistency is required in a few places in rustc, for
4242
//! example generator inference, and possibly also HIR borrowck.
4343
44-
use syntax::abi::Abi;
44+
use rustc_target::spec::abi::Abi;
4545
use syntax::ast::{NodeId, CRATE_NODE_ID, Name, Attribute};
4646
use syntax_pos::Span;
4747
use hir::*;

src/librustc/hir/map/blocks.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ use hir as ast;
2525
use hir::map::{self, Node};
2626
use hir::{Expr, FnDecl};
2727
use hir::intravisit::FnKind;
28-
use syntax::abi;
28+
use rustc_target::spec::abi;
2929
use syntax::ast::{Attribute, Name, NodeId};
3030
use syntax_pos::Span;
3131

src/librustc/hir/map/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use hir::def_id::{CRATE_DEF_INDEX, DefId, LocalDefId, DefIndexAddressSpace};
2121

2222
use middle::cstore::CrateStore;
2323

24-
use syntax::abi::Abi;
24+
use rustc_target::spec::abi::Abi;
2525
use syntax::ast::{self, Name, NodeId, CRATE_NODE_ID};
2626
use syntax::codemap::Spanned;
2727
use syntax::ext::base::MacroKind;

src/librustc/hir/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ use mir::mono::Linkage;
3434

3535
use syntax_pos::{Span, DUMMY_SP};
3636
use syntax::codemap::{self, Spanned};
37-
use syntax::abi::Abi;
37+
use rustc_target::spec::abi::Abi;
3838
use syntax::ast::{self, Name, NodeId, DUMMY_NODE_ID, AsmDialect};
3939
use syntax::ast::{Attribute, Lit, StrStyle, FloatTy, IntTy, UintTy, MetaItem};
4040
use syntax::attr::InlineAttr;

src/librustc/hir/print.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
pub use self::AnnNode::*;
1212

13-
use syntax::abi::Abi;
13+
use rustc_target::spec::abi::Abi;
1414
use syntax::ast;
1515
use syntax::codemap::{CodeMap, Spanned};
1616
use syntax::parse::{token, ParseSess};

src/librustc/ich/impls_syntax.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ impl_stable_hash_for!(enum ::syntax::ext::base::MacroKind {
8282
});
8383

8484

85-
impl_stable_hash_for!(enum ::syntax::abi::Abi {
85+
impl_stable_hash_for!(enum ::rustc_target::spec::abi::Abi {
8686
Cdecl,
8787
Stdcall,
8888
Fastcall,

src/librustc/middle/intrinsicck.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ use hir::def_id::DefId;
1313
use ty::{self, Ty, TyCtxt};
1414
use ty::layout::{LayoutError, Pointer, SizeSkeleton};
1515

16-
use syntax::abi::Abi::RustIntrinsic;
16+
use rustc_target::spec::abi::Abi::RustIntrinsic;
1717
use syntax_pos::Span;
1818
use hir::intravisit::{self, Visitor, NestedVisitorMap};
1919
use hir;

src/librustc/middle/reachable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ use middle::privacy;
2626
use session::config;
2727
use util::nodemap::{NodeSet, FxHashSet};
2828

29-
use syntax::abi::Abi;
29+
use rustc_target::spec::abi::Abi;
3030
use syntax::ast;
3131
use syntax::attr;
3232
use hir;

src/librustc/traits/error_reporting.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1091,15 +1091,15 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
10911091
tcx.mk_infer(ty::TyVar(ty::TyVid { index: 0 })),
10921092
false,
10931093
hir::Unsafety::Normal,
1094-
::syntax::abi::Abi::Rust
1094+
::rustc_target::spec::abi::Abi::Rust
10951095
)
10961096
} else {
10971097
tcx.mk_fn_sig(
10981098
::std::iter::once(inputs),
10991099
tcx.mk_infer(ty::TyVar(ty::TyVid { index: 0 })),
11001100
false,
11011101
hir::Unsafety::Normal,
1102-
::syntax::abi::Abi::Rust
1102+
::rustc_target::spec::abi::Abi::Rust
11031103
)
11041104
};
11051105
format!("{}", ty::Binder::bind(sig))

0 commit comments

Comments
 (0)