diff options
| author | bors <bors@rust-lang.org> | 2016-05-27 03:56:19 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-27 03:56:19 -0700 |
| commit | ab7c35fa0fcd725cdc207487b760d85fd07ecdd7 (patch) | |
| tree | 374bb44d05648bb9b73998a8dc0118c96d467786 /src/libstd | |
| parent | 36d5dc7c9bcfd287b5c4e4ac3e2f0ab93bdaa0c9 (diff) | |
| parent | 2c4fd94636f9f495474a943b716a9ab0ac1bec99 (diff) | |
| download | rust-ab7c35fa0fcd725cdc207487b760d85fd07ecdd7.tar.gz rust-ab7c35fa0fcd725cdc207487b760d85fd07ecdd7.zip | |
Auto merge of #33900 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 10 pull requests - Successful merges: #33753, #33815, #33829, #33858, #33865, #33866, #33870, #33874, #33891, #33898 - Failed merges:
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net/ip.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/net/ip.rs b/src/libstd/net/ip.rs index 45b85d600a6..ba485f819f8 100644 --- 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)) } } |