diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-10-30 08:58:06 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-10-30 17:36:49 -0700 |
| commit | f3d72dc6a7d74e37f5f37c67682a0f4ee52a0898 (patch) | |
| tree | 13a9b4e952602b35e006911f2cb8e949d28da0da /src/libstd | |
| parent | d7ee04c5c4f18cf56ddbe3f1b1758f3657cd6830 (diff) | |
| parent | 8e9f8f924cda8193ce1416c45cdcfce35fa6b8d1 (diff) | |
| download | rust-f3d72dc6a7d74e37f5f37c67682a0f4ee52a0898.tar.gz rust-f3d72dc6a7d74e37f5f37c67682a0f4ee52a0898.zip | |
rollup merge of #18443 : alexcrichton/deref-vec-and-string
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/comm_adapters.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/addrinfo.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/io/comm_adapters.rs b/src/libstd/io/comm_adapters.rs index 07f4ebda2d4..91f3f38f89d 100644 --- a/src/libstd/io/comm_adapters.rs +++ b/src/libstd/io/comm_adapters.rs @@ -15,7 +15,7 @@ use comm::{Sender, Receiver}; use io; use option::{None, Some}; use result::{Ok, Err}; -use slice::{bytes, CloneableVector}; +use slice::{bytes, CloneableVector, ImmutableSlice}; use super::{Buffer, Reader, Writer, IoResult}; use vec::Vec; diff --git a/src/libstd/io/net/addrinfo.rs b/src/libstd/io/net/addrinfo.rs index 9d85701eb29..eaf47bb004c 100644 --- a/src/libstd/io/net/addrinfo.rs +++ b/src/libstd/io/net/addrinfo.rs @@ -125,6 +125,7 @@ fn lookup(hostname: Option<&str>, servname: Option<&str>, hint: Option<Hint>) // permission without help of apk #[cfg(all(test, not(target_os = "android")))] mod test { + use prelude::*; use super::*; use io::net::ip::*; |