Imported Upstream version 1.1.0+dfsg1

[rustc.git] / src / librustc_trans / trans / cabi_x86.rs

diff --git a/src/librustc_trans/trans/cabi_x86.rs b/src/librustc_trans/trans/cabi_x86.rs
index 028d20f308474eea3eed27a71d5059a5edf5a86f..50a3095dea16970d43c4b350255728c10e2897b4 100644 (file)
--- a/src/librustc_trans/trans/cabi_x86.rs
+++ b/src/librustc_trans/trans/cabi_x86.rs
@@ -52,11 +52,11 @@ pub fn compute_abi_info(ccx: &CrateContext,
                 ret_ty = ArgType::direct(rty, Some(t), None, None);
             }
             RetPointer => {
-                ret_ty = ArgType::indirect(rty, Some(StructRetAttribute));
+                ret_ty = ArgType::indirect(rty, Some(Attribute::StructRet));
             }
         }
     } else {
-        let attr = if rty == Type::i1(ccx) { Some(ZExtAttribute) } else { None };
+        let attr = if rty == Type::i1(ccx) { Some(Attribute::ZExt) } else { None };
         ret_ty = ArgType::direct(rty, None, None, attr);
     }
 
@@ -67,11 +67,11 @@ pub fn compute_abi_info(ccx: &CrateContext,
                 if size == 0 {
                     ArgType::ignore(t)
                 } else {
-                    ArgType::indirect(t, Some(ByValAttribute))
+                    ArgType::indirect(t, Some(Attribute::ByVal))
                 }
             }
             _ => {
-                let attr = if t == Type::i1(ccx) { Some(ZExtAttribute) } else { None };
+                let attr = if t == Type::i1(ccx) { Some(Attribute::ZExt) } else { None };
                 ArgType::direct(t, None, None, attr)
             }
         };