diff options
| author | Steven Fackler <sfackler@gmail.com> | 2014-08-03 17:41:58 -0700 |
|---|---|---|
| committer | Steven Fackler <sfackler@gmail.com> | 2014-09-23 23:49:20 -0700 |
| commit | 65cca7c8b14e9c5673af4921a57c2ccbac3fc2cb (patch) | |
| tree | 2a693f86b51ea3725368b408efcc25d83041b9bd /src/libstd | |
| parent | e520bb1b2f1667f17c3503af71273921c4fc9989 (diff) | |
| download | rust-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')
| -rw-r--r-- | src/libstd/dynamic_lib.rs | 3 | ||||
| -rw-r--r-- | src/libstd/io/net/pipe.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/tcp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/net/udp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/f32.rs | 2 | ||||
| -rw-r--r-- | src/libstd/num/f64.rs | 2 |
6 files changed, 6 insertions, 7 deletions
diff --git a/src/libstd/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index e8d570f30e6..a88448f47e0 100644 --- a/src/libstd/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -162,8 +162,7 @@ mod test { use mem; #[test] - #[ignore(cfg(windows))] // FIXME #8818 - #[ignore(cfg(target_os="android"))] // FIXME(#10379) + #[cfg_attr(any(windows, target_os = "android"), ignore)] // FIXME #8818, #10379 fn test_loading_cosine() { // The math library does not need to be loaded since it is already // statically linked in 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(); diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index d91f5579c0d..b2a9f1b7b20 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -766,7 +766,7 @@ mod tests { assert_eq!((-0f32).frexp(), (-0f32, 0)); } - #[test] #[ignore(cfg(windows))] // FIXME #8755 + #[test] #[cfg_attr(windows, ignore)] // FIXME #8755 fn test_frexp_nowin() { let inf: f32 = Float::infinity(); let neg_inf: f32 = Float::neg_infinity(); diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index d8d118a6721..6fe9fcad2aa 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -768,7 +768,7 @@ mod tests { assert_eq!((-0f64).frexp(), (-0f64, 0)); } - #[test] #[ignore(cfg(windows))] // FIXME #8755 + #[test] #[cfg_attr(windows, ignore)] // FIXME #8755 fn test_frexp_nowin() { let inf: f64 = Float::infinity(); let neg_inf: f64 = Float::neg_infinity(); |