From 184c8a99ed279c7ca8d5f8d202184915b645ab1f Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 21 Sep 2015 11:45:04 +0200
Subject: [PATCH] Use ast::AsmDialect's variants qualified, and drop the
 pointless prefix.

---
 src/librustc_front/print/pprust.rs | 2 +-
 src/librustc_trans/trans/asm.rs    | 4 ++--
 src/libsyntax/ast.rs               | 5 ++---
 src/libsyntax/ext/asm.rs           | 5 +++--
 src/libsyntax/print/pprust.rs      | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/librustc_front/print/pprust.rs b/src/librustc_front/print/pprust.rs
index 7a5c59e2a4c..0ddbbdc392a 100644
--- a/src/librustc_front/print/pprust.rs
+++ b/src/librustc_front/print/pprust.rs
@@ -1539,7 +1539,7 @@ pub fn print_expr(&mut self, expr: &hir::Expr) -> io::Result<()> {
                 if a.alignstack {
                     options.push("alignstack");
                 }
-                if a.dialect == ast::AsmDialect::AsmIntel {
+                if a.dialect == ast::AsmDialect::Intel {
                     options.push("intel");
                 }
 
diff --git a/src/librustc_trans/trans/asm.rs b/src/librustc_trans/trans/asm.rs
index 07846515c64..c59237e3078 100644
--- a/src/librustc_trans/trans/asm.rs
+++ b/src/librustc_trans/trans/asm.rs
@@ -106,8 +106,8 @@ pub fn trans_inline_asm<'blk, 'tcx>(bcx: Block<'blk, 'tcx>, ia: &ast::InlineAsm)
     };
 
     let dialect = match ia.dialect {
-        AsmDialect::AsmAtt   => llvm::AD_ATT,
-        AsmDialect::AsmIntel => llvm::AD_Intel
+        AsmDialect::Att   => llvm::AD_ATT,
+        AsmDialect::Intel => llvm::AD_Intel
     };
 
     let asm = CString::new(ia.asm.as_bytes()).unwrap();
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 7b2b2c90126..5b04fc0e697 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -10,7 +10,6 @@
 
 // The Rust abstract syntax tree.
 
-pub use self::AsmDialect::*;
 pub use self::AttrStyle::*;
 pub use self::BindingMode::*;
 pub use self::BinOp_::*;
@@ -1440,8 +1439,8 @@ pub enum Ty_ {
 
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug, Copy)]
 pub enum AsmDialect {
-    AsmAtt,
-    AsmIntel
+    Att,
+    Intel,
 }
 
 #[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash, Debug)]
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs
index f1aa8139ec1..d2b416f5415 100644
--- a/src/libsyntax/ext/asm.rs
+++ b/src/libsyntax/ext/asm.rs
@@ -22,6 +22,7 @@
 use parse::token::{intern, InternedString};
 use parse::token;
 use ptr::P;
+use syntax::ast::AsmDialect;
 
 enum State {
     Asm,
@@ -65,7 +66,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
     let mut clobs = Vec::new();
     let mut volatile = false;
     let mut alignstack = false;
-    let mut dialect = ast::AsmAtt;
+    let mut dialect = AsmDialect::Att;
 
     let mut state = Asm;
 
@@ -178,7 +179,7 @@ pub fn expand_asm<'cx>(cx: &'cx mut ExtCtxt, sp: Span, tts: &[ast::TokenTree])
                 } else if option == "alignstack" {
                     alignstack = true;
                 } else if option == "intel" {
-                    dialect = ast::AsmIntel;
+                    dialect = AsmDialect::Intel;
                 } else {
                     cx.span_warn(p.last_span, "unrecognized option");
                 }
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 915abd4c0eb..df72645f97d 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -2209,7 +2209,7 @@ pub fn print_expr(&mut self, expr: &ast::Expr) -> io::Result<()> {
                 if a.alignstack {
                     options.push("alignstack");
                 }
-                if a.dialect == ast::AsmDialect::AsmIntel {
+                if a.dialect == ast::AsmDialect::Intel {
                     options.push("intel");
                 }
 
-- 
2.44.0