summary refs log tree commit diff
path: root/src/libstd/net
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-06 15:53:32 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-03-06 19:27:36 -0800
commitaed31ee08e9adff815e8a5df2499f2e4c6e7916b (patch)
tree62f22a53145acb3ea1fd95d8d4262ab9a342a421 /src/libstd/net
parent11ddfb8af0fcc69704e09b774de1a382e026f775 (diff)
downloadrust-aed31ee08e9adff815e8a5df2499f2e4c6e7916b.tar.gz
rust-aed31ee08e9adff815e8a5df2499f2e4c6e7916b.zip
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/net')
-rw-r--r--src/libstd/net/addr.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs
index d975369af49..101aae3eb24 100644
--- a/src/libstd/net/addr.rs
+++ b/src/libstd/net/addr.rs
@@ -592,6 +592,7 @@ mod tests {
     }
 
     #[test]
+    #[cfg(not(windows))]
     fn to_socket_addr_str_bad() {
         assert!(tsa("1200::AB00:1234::2552:7777:1313:34300").is_err());
     }