Merge pull request rust-lang#19 from sfackler/master

ABI fixes

Author: alexcrichton

ctest/src/lib.rs

@@ -1054,15 +1054,7 @@ impl<'a> Generator<'a> {
                 .connect(", ") + if variadic {", ..."} else {""}
         };
         let cret = self.rust_ty_to_c_ty(ret);
-        let abi = match abi {
-            Abi::C => "",
-            Abi::Stdcall => "__stdcall ",
-            Abi::System if self.target.contains("i686-pc-windows") => {
-                "__stdcall "
-            }
-            Abi::System => "",
-            a => panic!("unknown ABI: {}", a),
-        };
+        let abi = self.abi2str(abi);
         t!(writeln!(self.c, r#"
             {ret} ({abi}*__test_fn_{name}(void))({args}) {{
                 return {cname};
@@ -1176,12 +1168,13 @@ impl<'a> Generator<'a> {
             ast::TyKind::BareFn(ref t) => {
                 assert!(t.lifetimes.len() == 0);
                 let (ret, mut args, variadic) = self.decl2rust(&t.decl);
+                let abi = self.abi2str(t.abi);
                 if variadic {
                     args.push("...".to_string());
                 } else if args.len() == 0 {
                     args.push("void".to_string());
                 }
-                format!("{}(**{})({})", ret, sig, args.connect(", "))
+                format!("{}({}**{})({})", ret, abi, sig, args.connect(", "))
             }
             ast::TyKind::FixedLengthVec(ref t, ref e) => {
                 format!("{}(*{})[{}]", self.ty2name(t, false), sig,
@@ -1207,6 +1200,18 @@ impl<'a> Generator<'a> {
         }
     }
 
+    fn abi2str(&self, abi: Abi) -> &'static str {
+        match abi {
+            Abi::C => "",
+            Abi::Stdcall => "__stdcall ",
+            Abi::System if self.target.contains("i686-pc-windows") => {
+                "__stdcall "
+            }
+            Abi::System => "",
+            a => panic!("unknown ABI: {}", a),
+        }
+    }
+
     fn decl2rust(&self, decl: &ast::FnDecl) -> (String, Vec<String>, bool) {
         let args = decl.inputs.iter().map(|arg| {
             self.ty2name(&arg.ty, false)
@@ -1260,7 +1265,7 @@ impl<'a, 'v> Visitor<'v> for Generator<'a> {
                 self.test_const(&i.ident.to_string(), &ty);
             }
 
-            ast::ItemKind::ForeignMod(ref fm) if public => {
+            ast::ItemKind::ForeignMod(ref fm) => {
                 self.abi = fm.abi;
             }