Skip to content

Commit a9da34b

Browse files
committed
librustc: Fix merge fallout.
1 parent 39693e7 commit a9da34b

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

src/librustc/middle/trans/common.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ use middle::ty;
4141
use middle::typeck;
4242
use util::ppaux::{Repr};
4343

44+
use core::cast::transmute;
4445
use core::hash;
4546
use core::hashmap::{HashMap, HashSet};
4647
use core::libc::{c_uint, c_longlong, c_ulonglong};

src/libstd/net_ip.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ pub mod v4 {
151151
use uv_ip4_addr = uv::ll::ip4_addr;
152152
use uv_ip4_name = uv::ll::ip4_name;
153153
154+
use core::cast::transmute;
154155
use core::ptr;
155156
use core::result;
156157
use core::str;

0 commit comments

Comments
 (0)