diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2013-04-29 10:47:26 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2013-04-29 14:30:57 -0700 |
| commit | 78f33437b66793b10eb2a72d0d20cbf2bf0eacb5 (patch) | |
| tree | 66132a53979403297cbe192ce936cfa7c5b3cb1f /src/libstd | |
| parent | 2c6dae081b72d33a2c51b5f46436e6350bb3682f (diff) | |
| download | rust-78f33437b66793b10eb2a72d0d20cbf2bf0eacb5.tar.gz rust-78f33437b66793b10eb2a72d0d20cbf2bf0eacb5.zip | |
libstd: Fix merge fallout.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net_ip.rs | 1 | ||||
| -rw-r--r-- | src/libstd/priority_queue.rs | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/net_ip.rs b/src/libstd/net_ip.rs index 0608d9dc3f2..800144c0ca7 100644 --- a/src/libstd/net_ip.rs +++ b/src/libstd/net_ip.rs @@ -152,7 +152,6 @@ pub mod v4 { use uv_ip4_name = uv::ll::ip4_name; use core::cast::transmute; - use core::ptr; use core::result; use core::str; use core::uint; diff --git a/src/libstd/priority_queue.rs b/src/libstd/priority_queue.rs index 6f408823410..47af3576c90 100644 --- a/src/libstd/priority_queue.rs +++ b/src/libstd/priority_queue.rs @@ -11,7 +11,6 @@ //! A priority queue implemented with a binary heap use core::old_iter::BaseIter; -use core::ptr::addr_of; #[abi = "rust-intrinsic"] extern "rust-intrinsic" mod rusti { |