From a9da34bf6eb88ac20a7240d05022d6ebf136a6eb Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Sun, 28 Apr 2013 10:53:42 -0700
Subject: [PATCH] librustc: Fix merge fallout.

---
 src/librustc/middle/trans/common.rs | 1 +
 src/libstd/net_ip.rs                | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/librustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs
index 96071377a451..f8fb0f4b7cf3 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 bf1b9dc0cda9..0608d9dc3f2e 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;