mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove allocations in impl Display for Ipv6Addr

Browse Source
This commit is contained in:
Simon Sapin 2015-12-05 00:44:16 +01:00
parent 55a4e05092
commit 507d8caf6d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/libstd/net/ip.rs
View File

@ -13,8 +13,6 @@
be stable",
issue = "27709")]
use prelude::v1::*;
use cmp::Ordering;
use fmt;
use hash;
@ -446,17 +444,19 @@ fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let (zeros_at, zeros_len) = find_zero_slice(&self.segments());
if zeros_len > 1 {
fn fmt_subslice(segments: &[u16]) -> String {
segments
.iter()
.map(|&seg| format!("{:x}", seg))
.collect::<Vec<String>>()
.join(":")
fn fmt_subslice(segments: &[u16], fmt: &mut fmt::Formatter) -> fmt::Result {
if !segments.is_empty() {
try!(write!(fmt, "{:x}", segments[0]));
for &seg in &segments[1..] {
try!(write!(fmt, ":{:x}", seg));
}
}
Ok(())
}
write!(fmt, "{}::{}",
fmt_subslice(&self.segments()[..zeros_at]),
fmt_subslice(&self.segments()[zeros_at + zeros_len..]))
try!(fmt_subslice(&self.segments()[..zeros_at], fmt));
try!(fmt.write_str("::"));
fmt_subslice(&self.segments()[zeros_at + zeros_len..], fmt)
} else {
let &[a, b, c, d, e, f, g, h] = &self.segments();
write!(fmt, "{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}",