diff options
| author | Thom Chiovoloni <chiovolonit@gmail.com> | 2021-08-08 01:04:33 -0700 | 
|---|---|---|
| committer | Thom Chiovoloni <chiovolonit@gmail.com> | 2022-02-04 18:47:29 -0800 | 
| commit | 554918e311a1221744aa9b6d60e2f00f5b3155e5 (patch) | |
| tree | e8affa7ee0e7729cf05633c7b7989aaaa96bdd8c /library/std/src/os/unix/net/addr.rs | |
| parent | 71226d717a1fb57122e47e63b97295e703319cb0 (diff) | |
| download | rust-554918e311a1221744aa9b6d60e2f00f5b3155e5.tar.gz rust-554918e311a1221744aa9b6d60e2f00f5b3155e5.zip | |
Hide Repr details from io::Error, and rework `io::Error::new_const`.
Diffstat (limited to 'library/std/src/os/unix/net/addr.rs')
| -rw-r--r-- | library/std/src/os/unix/net/addr.rs | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/library/std/src/os/unix/net/addr.rs b/library/std/src/os/unix/net/addr.rs index 9dbd4548bc9..034fa301ba1 100644 --- a/library/std/src/os/unix/net/addr.rs +++ b/library/std/src/os/unix/net/addr.rs @@ -30,16 +30,16 @@ pub(super) fn sockaddr_un(path: &Path) -> io::Result<(libc::sockaddr_un, libc::s let bytes = path.as_os_str().as_bytes(); if bytes.contains(&0) { - return Err(io::Error::new_const( + return Err(io::const_io_error!( io::ErrorKind::InvalidInput, - &"paths must not contain interior null bytes", + "paths must not contain interior null bytes", )); } if bytes.len() >= addr.sun_path.len() { - return Err(io::Error::new_const( + return Err(io::const_io_error!( io::ErrorKind::InvalidInput, - &"path must be shorter than SUN_LEN", + "path must be shorter than SUN_LEN", )); } // SAFETY: `bytes` and `addr.sun_path` are not overlapping and @@ -121,9 +121,9 @@ impl SocketAddr { // linux returns zero bytes of address len = sun_path_offset(&addr) as libc::socklen_t; // i.e., zero-length address } else if addr.sun_family != libc::AF_UNIX as libc::sa_family_t { - return Err(io::Error::new_const( + return Err(io::const_io_error!( io::ErrorKind::InvalidInput, - &"file descriptor did not correspond to a Unix socket", + "file descriptor did not correspond to a Unix socket", )); } @@ -323,9 +323,9 @@ impl SocketAddr { addr.sun_family = libc::AF_UNIX as libc::sa_family_t; if namespace.len() + 1 > addr.sun_path.len() { - return Err(io::Error::new_const( + return Err(io::const_io_error!( io::ErrorKind::InvalidInput, - &"namespace must be shorter than SUN_LEN", + "namespace must be shorter than SUN_LEN", )); } | 
