diff options
| author | bors <bors@rust-lang.org> | 2019-01-14 13:03:24 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-14 13:03:24 +0000 |
| commit | d10680818b2a0aabb76e6a07098e031b31707fcc (patch) | |
| tree | 441a29928ac1f0af09beac0f604ddd3125246fb2 /src/libstd | |
| parent | 1a3a3dfcdd7faf0b8ab266a79a4a35ab30e5136a (diff) | |
| parent | 47ccf2a7fc2fa17c7316e29a05f0a0b432253743 (diff) | |
| download | rust-d10680818b2a0aabb76e6a07098e031b31707fcc.tar.gz rust-d10680818b2a0aabb76e6a07098e031b31707fcc.zip | |
Auto merge of #57592 - Centril:rollup, r=Centril
Rollup of 6 pull requests Successful merges: - #57232 (Parallelize and optimize parts of HIR map creation) - #57418 (MetadataOnlyCodegenBackend: run the collector only once) - #57465 (Stabilize cfg_target_vendor) - #57477 (clarify resolve typo suggestion) - #57556 (privacy: Fix private-in-public check for existential types) - #57584 (Remove the `connect_timeout_unroutable` test.) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net/tcp.rs | 11 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index e2200808449..41f1ac867ed 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -238,7 +238,7 @@ #![feature(c_variadic)] #![feature(cfg_target_has_atomic)] #![feature(cfg_target_thread_local)] -#![feature(cfg_target_vendor)] +#![cfg_attr(stage0, feature(cfg_target_vendor))] #![feature(char_error_internals)] #![feature(compiler_builtins_lib)] #![feature(concat_idents)] diff --git a/src/libstd/net/tcp.rs b/src/libstd/net/tcp.rs index b75591e53fc..86ecb10edf2 100644 --- a/src/libstd/net/tcp.rs +++ b/src/libstd/net/tcp.rs @@ -1674,17 +1674,6 @@ mod tests { } #[test] - fn connect_timeout_unroutable() { - // this IP is unroutable, so connections should always time out, - // provided the network is reachable to begin with. - let addr = "10.255.255.1:80".parse().unwrap(); - let e = TcpStream::connect_timeout(&addr, Duration::from_millis(250)).unwrap_err(); - assert!(e.kind() == io::ErrorKind::TimedOut || - e.kind() == io::ErrorKind::Other, - "bad error: {} {:?}", e, e.kind()); - } - - #[test] fn connect_timeout_unbound() { // bind and drop a socket to track down a "probably unassigned" port let socket = TcpListener::bind("127.0.0.1:0").unwrap(); |
