From 06a97a027a21f6fe67f91b0630291fbb62d2de83 Mon Sep 17 00:00:00 2001 From: Nathan West Date: Fri, 22 May 2020 15:59:38 -0400 Subject: [PATCH] Clarify comment message & MAX_LENGTH const --- src/libstd/net/addr.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/libstd/net/addr.rs b/src/libstd/net/addr.rs index 2febe157a506..b780340884e1 100644 --- a/src/libstd/net/addr.rs +++ b/src/libstd/net/addr.rs @@ -605,11 +605,14 @@ impl fmt::Display for SocketAddrV4 { if f.precision().is_none() && f.width().is_none() { write!(f, "{}:{}", self.ip(), self.port()) } else { - const IPV4_SOCKET_BUF_LEN: usize = 21; + const IPV4_SOCKET_BUF_LEN: usize = (3 * 4) // the segments + + 3 // the separators + + 1 + 5; // the port let mut buf = [0; IPV4_SOCKET_BUF_LEN]; let mut buf_slice = &mut buf[..]; - // Unwrap is fine because writing to a buffer is infallible + // Unwrap is fine because writing to a sufficiently-sized + // buffer is infallible write!(buf_slice, "{}:{}", self.ip(), self.port()).unwrap(); let len = IPV4_SOCKET_BUF_LEN - buf_slice.len(); @@ -643,7 +646,8 @@ impl fmt::Display for SocketAddrV6 { let mut buf = [0; IPV6_SOCKET_BUF_LEN]; let mut buf_slice = &mut buf[..]; - // Unwrap is fine because writing to a buffer is infallible + // Unwrap is fine because writing to a sufficiently-sized + // buffer is infallible write!(buf_slice, "[{}]:{}", self.ip(), self.port()).unwrap(); let len = IPV6_SOCKET_BUF_LEN - buf_slice.len();