diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net/udp.rs | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 3ad5b5627d3..d1b8fcd7440 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -686,7 +686,7 @@ impl ToOwned for CStr { type Owned = CString; fn to_owned(&self) -> CString { - unsafe { CString::from_vec_unchecked(self.to_bytes().to_vec()) } + CString { inner: self.to_bytes_with_nul().to_vec().into_boxed_slice() } } } diff --git a/src/libstd/net/udp.rs b/src/libstd/net/udp.rs index c03ac496adb..559250adac5 100644 --- a/src/libstd/net/udp.rs +++ b/src/libstd/net/udp.rs @@ -67,6 +67,9 @@ impl UdpSocket { /// /// Address type can be any implementor of `ToSocketAddrs` trait. See its /// documentation for concrete examples. + /// This will return an error when the IP version of the local socket + /// does not match that returned from `ToSocketAddrs` + /// See https://github.com/rust-lang/rust/issues/34202 for more details. #[stable(feature = "rust1", since = "1.0.0")] pub fn send_to<A: ToSocketAddrs>(&self, buf: &[u8], addr: A) -> io::Result<usize> { |