about summary refs log tree commit diff
path: root/src/libstd/io
diff options
context:
space:
mode:
authorSteven Fackler <sfackler@gmail.com>2014-08-03 17:41:58 -0700
committerSteven Fackler <sfackler@gmail.com>2014-09-23 23:49:20 -0700
commit65cca7c8b14e9c5673af4921a57c2ccbac3fc2cb (patch)
tree2a693f86b51ea3725368b408efcc25d83041b9bd /src/libstd/io
parente520bb1b2f1667f17c3503af71273921c4fc9989 (diff)
downloadrust-65cca7c8b14e9c5673af4921a57c2ccbac3fc2cb.tar.gz
rust-65cca7c8b14e9c5673af4921a57c2ccbac3fc2cb.zip
Deprecate `#[ignore(cfg(...))]`
Replace `#[ignore(cfg(a, b))]` with `#[cfg_attr(all(a, b), ignore)]`
Diffstat (limited to 'src/libstd/io')
-rw-r--r--src/libstd/io/net/pipe.rs2
-rw-r--r--src/libstd/io/net/tcp.rs2
-rw-r--r--src/libstd/io/net/udp.rs2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/io/net/pipe.rs b/src/libstd/io/net/pipe.rs
index bdd58b07d86..9faa0182372 100644
--- a/src/libstd/io/net/pipe.rs
+++ b/src/libstd/io/net/pipe.rs
@@ -320,7 +320,7 @@ mod tests {
         }, proc(_client) {
             // drop the client
         })
-    } #[ignore(cfg(windows))]) // FIXME(#12516)
+    } #[cfg_attr(windows, ignore)]) // FIXME(#12516)
 
     iotest!(fn write_begone() {
         smalltest(proc(mut server) {
diff --git a/src/libstd/io/net/tcp.rs b/src/libstd/io/net/tcp.rs
index d787f0e9854..65d8f1c9c77 100644
--- a/src/libstd/io/net/tcp.rs
+++ b/src/libstd/io/net/tcp.rs
@@ -533,7 +533,7 @@ mod test {
             Ok(..) => fail!(),
             Err(e) => assert_eq!(e.kind, PermissionDenied),
         }
-    } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
+    } #[cfg_attr(any(windows, target_os = "android"), ignore)])
 
     iotest!(fn connect_error() {
         match TcpStream::connect("0.0.0.0", 1) {
diff --git a/src/libstd/io/net/udp.rs b/src/libstd/io/net/udp.rs
index 6689615f01b..9718ceb1185 100644
--- a/src/libstd/io/net/udp.rs
+++ b/src/libstd/io/net/udp.rs
@@ -273,7 +273,7 @@ mod test {
             Ok(..) => fail!(),
             Err(e) => assert_eq!(e.kind, PermissionDenied),
         }
-    } #[ignore(cfg(windows))] #[ignore(cfg(target_os = "android"))])
+    } #[cfg_attr(any(windows, target_os = "android"), ignore)])
 
     iotest!(fn socket_smoke_test_ip4() {
         let server_ip = next_test_ip4();