dnrops
/
rust
mirror of https://github.com/rust-lang/rust.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

auto merge of #12149 : thomaslee/rust/ipaddr_deriving_iter_bytes, r=cmr 

This is a fairly trivial (but IMHO handy) change to implement IterBytes for IpAddr and SocketAddr.

I originally stumbled across this because I wanted to use a SocketAddr as a HashMap key and discovered that I couldn't do it directly. Had to impl IterBytes on a new intermediate type to work around it.
This commit is contained in:
bors 2014-02-10 06:31:27 -08:00
parent d440a569bb e205185095
commit d324917596
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/libstd/io/net/ip.rs
View File

@ -14,11 +14,12 @@ use iter::Iterator;
use option::{Option, None, Some}; use option::{Option, None, Some};
use str::StrSlice; use str::StrSlice;
use to_str::ToStr; use to_str::ToStr;
use to_bytes::IterBytes;
use vec::{MutableCloneableVector, ImmutableVector, MutableVector}; use vec::{MutableCloneableVector, ImmutableVector, MutableVector};
pub type Port = u16; pub type Port = u16;
#[deriving(Eq, TotalEq, Clone)] #[deriving(Eq, TotalEq, Clone, IterBytes)]
pub enum IpAddr { pub enum IpAddr {
Ipv4Addr(u8, u8, u8, u8), Ipv4Addr(u8, u8, u8, u8),
Ipv6Addr(u16, u16, u16, u16, u16, u16, u16, u16) Ipv6Addr(u16, u16, u16, u16, u16, u16, u16, u16)
@ -48,7 +49,7 @@ impl ToStr for IpAddr {
} }
} }
#[deriving(Eq, TotalEq, Clone)] #[deriving(Eq, TotalEq, Clone, IterBytes)]
pub struct SocketAddr { pub struct SocketAddr {
ip: IpAddr, ip: IpAddr,
port: Port, port: Port,
@ -339,6 +340,7 @@ impl FromStr for SocketAddr {
mod test { mod test {
use prelude::*; use prelude::*;
use super::*; use super::*;
use to_bytes::ToBytes;
#[test] #[test]
fn test_from_str_ipv4() { fn test_from_str_ipv4() {
@ -441,4 +443,13 @@ mod test {
assert_eq!(Ipv6Addr(8, 9, 10, 11, 12, 13, 14, 15).to_str(), ~"8:9:a:b:c:d:e:f"); assert_eq!(Ipv6Addr(8, 9, 10, 11, 12, 13, 14, 15).to_str(), ~"8:9:a:b:c:d:e:f");
} }
#[test]
fn ipv4_addr_to_bytes() {
Ipv4Addr(123, 20, 12, 56).to_bytes(true);
}
#[test]
fn socket_addr_to_bytes() {
SocketAddr { ip: Ipv4Addr(1, 2, 3, 4), port: 1234 }.to_bytes(true);
}
} }