OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rollup merge of #81202 - lzutao:dbg_ipv6, r=Amanieu 

Don't prefix 0x for each segments in `dbg!(Ipv6)`

Fixes #81182
This commit is contained in:
Mara Bos 2021-01-22 14:30:12 +00:00 committed by GitHub
parent b59f6e05ef 116b66ad49
commit 950ed27e8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/std/src/net/ip.rs
View File

@ -1610,11 +1610,11 @@ impl fmt::Display for Ipv6Addr {
/// Write a colon-separated part of the address
#[inline]
fn fmt_subslice(f: &mut fmt::Formatter<'_>, chunk: &[u16]) -> fmt::Result {
if let Some(first) = chunk.first() {
fmt::LowerHex::fmt(first, f)?;
for segment in &chunk[1..] {
if let Some((first, tail)) = chunk.split_first() {
write!(f, "{:x}", first)?;
for segment in tail {
f.write_char(':')?;
fmt::LowerHex::fmt(segment, f)?;
write!(f, "{:x}", segment)?;
}
}
Ok(())

3
library/std/src/net/ip/tests.rs
View File

@ -166,6 +166,9 @@ fn ipv6_addr_to_string() {
// two runs of zeros, equal length
assert_eq!("1::4:5:0:0:8", Ipv6Addr::new(1, 0, 0, 4, 5, 0, 0, 8).to_string());
// don't prefix `0x` to each segment in `dbg!`.
assert_eq!("1::4:5:0:0:8", &format!("{:#?}", Ipv6Addr::new(1, 0, 0, 4, 5, 0, 0, 8)));
}
#[test]