diff options
| author | bors <bors@rust-lang.org> | 2014-08-14 05:36:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-14 05:36:25 +0000 |
| commit | 385c39a77b238df9371ee8bccc768b8d39258edd (patch) | |
| tree | 4d10ee4e9842587cccecdf5a4bf96ef13347362a /src/libstd/io/net | |
| parent | 9d45d63d0d18f21f74c8a2a4e5367a785932f64e (diff) | |
| parent | fce442e75c5b3df8eea401fae1200314f0d47c40 (diff) | |
| download | rust-385c39a77b238df9371ee8bccc768b8d39258edd.tar.gz rust-385c39a77b238df9371ee8bccc768b8d39258edd.zip | |
auto merge of #16332 : brson/rust/slicestab, r=aturon
This implements some of the recommendations from https://github.com/rust-lang/meeting-minutes/blob/master/Meeting-API-review-2014-08-06.md. Explanation in commits.
Diffstat (limited to 'src/libstd/io/net')
| -rw-r--r-- | src/libstd/io/net/ip.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/io/net/ip.rs b/src/libstd/io/net/ip.rs index 0f864c7be5e..ed76cdc276b 100644 --- a/src/libstd/io/net/ip.rs +++ b/src/libstd/io/net/ip.rs @@ -21,7 +21,7 @@ use from_str::FromStr; use iter::Iterator; use option::{Option, None, Some}; use str::StrSlice; -use slice::{MutableCloneableVector, ImmutableVector, MutableVector}; +use slice::{MutableCloneableSlice, ImmutableSlice, MutableSlice}; pub type Port = u16; diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs index 5c91c48c55d..7055b9d7a47 100644 --- a/src/libstd/io/net/tcp.rs +++ b/src/libstd/io/net/tcp.rs @@ -21,7 +21,7 @@ use clone::Clone; use collections::MutableSeq; use io::IoResult; use iter::Iterator; -use slice::ImmutableVector; +use slice::ImmutableSlice; use result::{Ok,Err}; use io::net::addrinfo::get_host_addresses; use io::net::ip::SocketAddr; |
