diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-08-21 22:14:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-21 22:14:13 +0000 |
| commit | 426b09aad926802437fcedf60ca3709a288729af (patch) | |
| tree | 381f59e37fb5210682de8ca183874a4390a74f78 | |
| parent | 8866df67e3601fdce1c0794ad03a01579f8aa0f7 (diff) | |
| parent | c96141d423eb415ba9720519794f6448044006f0 (diff) | |
| download | nix-426b09aad926802437fcedf60ca3709a288729af.zip | |
Merge #1495
1495: Deprecate SockAddr/InetAddr::to_str r=asomers a=coolreader18
Co-authored-by: Noah <33094578+coolreader18@users.noreply.github.com>
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | src/sys/socket/addr.rs | 2 | ||||
| -rw-r--r-- | test/sys/test_socket.rs | 6 |
3 files changed, 8 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e7d222e..eb2c98a3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -80,6 +80,9 @@ This project adheres to [Semantic Versioning](https://semver.org/). Rustc and Xcode. (#[1492](https://github.com/nix-rust/nix/pull/1492)) +- Deprecated `SockAddr/InetAddr::to_str` in favor of `ToString::to_string` + (#[1495](https://github.com/nix-rust/nix/pull/1495)) + ## [0.22.0] - 9 July 2021 ### Added - Added `if_nameindex` (#[1445](https://github.com/nix-rust/nix/pull/1445)) diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs index a964d61b..0f907bbe 100644 --- a/src/sys/socket/addr.rs +++ b/src/sys/socket/addr.rs @@ -344,6 +344,7 @@ impl InetAddr { } } + #[deprecated(since = "0.23.0", note = "use .to_string() instead")] pub fn to_str(&self) -> String { format!("{}", self) } @@ -722,6 +723,7 @@ impl SockAddr { } } + #[deprecated(since = "0.23.0", note = "use .to_string() instead")] pub fn to_str(&self) -> String { format!("{}", self) } diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs index c43d0672..92bb30e0 100644 --- a/test/sys/test_socket.rs +++ b/test/sys/test_socket.rs @@ -28,7 +28,7 @@ pub fn test_inetv4_addr_to_sock_addr() { _ => panic!("nope"), } - assert_eq!(addr.to_str(), "127.0.0.1:3000"); + assert_eq!(addr.to_string(), "127.0.0.1:3000"); let inet = addr.to_std(); assert_eq!(actual, inet); @@ -194,8 +194,8 @@ pub fn test_getsockname() { .expect("socket failed"); let sockaddr = SockAddr::new_unix(&sockname).unwrap(); bind(sock, &sockaddr).expect("bind failed"); - assert_eq!(sockaddr.to_str(), - getsockname(sock).expect("getsockname failed").to_str()); + assert_eq!(sockaddr.to_string(), + getsockname(sock).expect("getsockname failed").to_string()); } #[test] |