diff --git a/src/librustc_front/hir.rs b/src/librustc_front/hir.rs index c6426807db45b..8d40a34ef08a8 100644 --- a/src/librustc_front/hir.rs +++ b/src/librustc_front/hir.rs @@ -10,7 +10,6 @@ // The Rust HIR. -pub use self::AsmDialect::*; pub use self::BindingMode::*; pub use self::BinOp_::*; pub use self::BlockCheckMode::*; @@ -41,7 +40,7 @@ pub use self::PathParameters::*; use syntax::codemap::{self, Span, Spanned, DUMMY_SP, ExpnId}; use syntax::abi::Abi; -use syntax::ast::{Name, Ident, NodeId, DUMMY_NODE_ID, TokenTree}; +use syntax::ast::{Name, Ident, NodeId, DUMMY_NODE_ID, TokenTree, AsmDialect}; use syntax::ast::{Attribute, Lit, StrStyle, FloatTy, IntTy, UintTy, CrateConfig}; use syntax::owned_slice::OwnedSlice; use syntax::parse::token::InternedString; @@ -876,12 +875,6 @@ pub enum Ty_ { TyInfer, } -#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)] -pub enum AsmDialect { - AsmAtt, - AsmIntel -} - #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)] pub struct InlineAsm { pub asm: InternedString, diff --git a/src/librustc_front/lowering.rs b/src/librustc_front/lowering.rs index f7f938eb92482..36d375a3a1a2b 100644 --- a/src/librustc_front/lowering.rs +++ b/src/librustc_front/lowering.rs @@ -801,7 +801,7 @@ pub fn lower_expr(e: &Expr) -> P { clobbers: clobbers.clone(), volatile: volatile, alignstack: alignstack, - dialect: lower_asm_dialect(dialect), + dialect: dialect, expn_id: expn_id, }), ExprStruct(ref path, ref fields, ref maybe_expr) => { @@ -863,13 +863,6 @@ pub fn lower_capture_clause(c: CaptureClause) -> hir::CaptureClause { } } -pub fn lower_asm_dialect(a: AsmDialect) -> hir::AsmDialect { - match a { - AsmAtt => hir::AsmAtt, - AsmIntel => hir::AsmIntel, - } -} - pub fn lower_visibility(v: Visibility) -> hir::Visibility { match v { Public => hir::Public, diff --git a/src/librustc_front/print/pprust.rs b/src/librustc_front/print/pprust.rs index 3930eec756130..7a5c59e2a4c99 100644 --- a/src/librustc_front/print/pprust.rs +++ b/src/librustc_front/print/pprust.rs @@ -1539,7 +1539,7 @@ impl<'a> State<'a> { if a.alignstack { options.push("alignstack"); } - if a.dialect == hir::AsmDialect::AsmIntel { + if a.dialect == ast::AsmDialect::AsmIntel { options.push("intel"); } diff --git a/src/librustc_trans/trans/asm.rs b/src/librustc_trans/trans/asm.rs index 891baca75a860..07846515c6417 100644 --- a/src/librustc_trans/trans/asm.rs +++ b/src/librustc_trans/trans/asm.rs @@ -22,6 +22,7 @@ use trans::type_::Type; use rustc_front::hir as ast; use std::ffi::CString; +use syntax::ast::AsmDialect; use libc::{c_uint, c_char}; // Take an inline assembly expression and splat it out via LLVM @@ -105,8 +106,8 @@ pub fn trans_inline_asm<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, ia: &ast::InlineAsm) }; let dialect = match ia.dialect { - ast::AsmAtt => llvm::AD_ATT, - ast::AsmIntel => llvm::AD_Intel + AsmDialect::AsmAtt => llvm::AD_ATT, + AsmDialect::AsmIntel => llvm::AD_Intel }; let asm = CString::new(ia.asm.as_bytes()).unwrap();