Auto merge of #489 - emilio:use-core, r=fitzgen

codegen: Fix remaining cases of missing core prefix.

Fixes #488

r? @fitzgen

2 files changed, 8 insertions, 5 deletions

diff --git a/src/codegen/helpers.rs b/src/codegen/helpers.rs
index 06dadab0..9e19637c 100644
--- a/src/codegen/helpers.rs
+++ b/src/codegen/helpers.rs
@@ -89,7 +89,9 @@ pub mod ast_ty {
                 let prefix = ctx.rust_ident_raw(prefix);
                 quote_ty!(ctx.ext_cx(), $prefix::$ident)
             }
-            None => quote_ty!(ctx.ext_cx(), ::std::os::raw::$ident),
+            None => {
+                quote_ty!(ctx.ext_cx(), ::std::os::raw::$ident)
+            }
         }
     }
 
diff --git a/src/codegen/mod.rs b/src/codegen/mod.rs
index 5ee43173..d3e204ce 100644
--- a/src/codegen/mod.rs
+++ b/src/codegen/mod.rs
@@ -1644,9 +1644,10 @@ impl MethodCodegen for Method {
         // If it's a constructor, we need to insert an extra parameter with a
         // variable called `__bindgen_tmp` we're going to create.
         if self.is_constructor() {
+            let prefix = ctx.trait_prefix();
             let tmp_variable_decl =
                 quote_stmt!(ctx.ext_cx(),
-                            let mut __bindgen_tmp = ::std::mem::uninitialized())
+                            let mut __bindgen_tmp = ::$prefix::mem::uninitialized())
                 .unwrap();
             stmts.push(tmp_variable_decl);
             exprs[0] = quote_expr!(ctx.ext_cx(), &mut __bindgen_tmp);
@@ -2601,9 +2602,9 @@ mod utils {
             .unwrap();
 
         let union_field_debug_impl = quote_item!(ctx.ext_cx(),
-            impl<T> ::std::fmt::Debug for __BindgenUnionField<T> {
-                fn fmt(&self, fmt: &mut ::std::fmt::Formatter)
-                       -> ::std::fmt::Result {
+            impl<T> ::$prefix::fmt::Debug for __BindgenUnionField<T> {
+                fn fmt(&self, fmt: &mut ::$prefix::fmt::Formatter)
+                       -> ::$prefix::fmt::Result {
                     fmt.write_str("__BindgenUnionField")
                 }
             }