Rollup merge of #33891 - polachok:faster-ipv4-cmp, r=bluss

GuillaumeGomez · GuillaumeGomez · commit ee0821a37173 · 2016-05-27T10:50:05.000+02:00
Make Ipv4Addr cmp() faster Closes #33885
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs
@@ -251,7 +251,7 @@ impl PartialOrd for Ipv4Addr {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl Ord for Ipv4Addr {
     fn cmp(&self, other: &Ipv4Addr) -> Ordering {
-        self.octets().cmp(&other.octets())
+        ntoh(self.inner.s_addr).cmp(&ntoh(other.inner.s_addr))
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ impl PartialOrd for Ipv4Addr {`
`251`	`251`	`#[stable(feature = "rust1", since = "1.0.0")]`
`252`	`252`	`impl Ord for Ipv4Addr {`
`253`	`253`	`fn cmp(&self, other: &Ipv4Addr) -> Ordering {`
`254`		`- self.octets().cmp(&other.octets())`
	`254`	`+ ntoh(self.inner.s_addr).cmp(&ntoh(other.inner.s_addr))`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`