about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-04-28 10:53:42 -0700
committerPatrick Walton <pcwalton@mimiga.net>2013-04-29 14:30:57 -0700
commita9da34bf6eb88ac20a7240d05022d6ebf136a6eb (patch)
tree8450e3bc993a002f58d0c6fe05ee4ab5478436ac /src
parent39693e7b61c4ff3ea5a62fcc662e8ee9340c7d4f (diff)
downloadrust-a9da34bf6eb88ac20a7240d05022d6ebf136a6eb.tar.gz
rust-a9da34bf6eb88ac20a7240d05022d6ebf136a6eb.zip
librustc: Fix merge fallout.
Diffstat (limited to 'src')
-rw-r--r--src/librustc/middle/trans/common.rs1
-rw-r--r--src/libstd/net_ip.rs1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs
index 96071377a45..f8fb0f4b7cf 100644
--- a/src/librustc/middle/trans/common.rs
+++ b/src/librustc/middle/trans/common.rs
@@ -41,6 +41,7 @@ use middle::ty;
 use middle::typeck;
 use util::ppaux::{Repr};
 
+use core::cast::transmute;
 use core::hash;
 use core::hashmap::{HashMap, HashSet};
 use core::libc::{c_uint, c_longlong, c_ulonglong};
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs
index bf1b9dc0cda..0608d9dc3f2 100644
--- a/src/libstd/net_ip.rs
+++ b/src/libstd/net_ip.rs
@@ -151,6 +151,7 @@ pub mod v4 {
     use uv_ip4_addr = uv::ll::ip4_addr;
     use uv_ip4_name = uv::ll::ip4_name;
 
+    use core::cast::transmute;
     use core::ptr;
     use core::result;
     use core::str;