about summary refs log tree commit diff
path: root/library/std/src/ffi
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2021-03-24 01:52:29 +0100
committerGitHub <noreply@github.com>2021-03-24 01:52:29 +0100
commita42e62fa0a59d0ba620889f97513929a113a6fbd (patch)
treec8dabc69676343818b44914550e763ddd18d214d /library/std/src/ffi
parent2f611da1d66ae98b53358bcb7739884524b7e18d (diff)
parent6bbcc5bfbbfd9ba5a6d584a753fa32d80e3a7a17 (diff)
downloadrust-a42e62fa0a59d0ba620889f97513929a113a6fbd.tar.gz
rust-a42e62fa0a59d0ba620889f97513929a113a6fbd.zip
Rollup merge of #83353 - m-ou-se:io-error-avoid-alloc, r=nagisa
Add internal io::Error::new_const to avoid allocations.

This makes it possible to have a io::Error containing a message with zero allocations, and uses that everywhere to avoid the *three* allocations involved in `io::Error::new(kind, "message")`.

The function signature isn't perfect, because it needs a reference to the `&str`. So for now, this is just a `pub(crate)` function. Later, we'll be able to use `fn new_const<MSG: &'static str>(kind: ErrorKind)` to make that a bit better. (Then we'll also be able to use some ZST trickery if that would result in more efficient code.)

See https://github.com/rust-lang/rust/issues/83352
Diffstat (limited to 'library/std/src/ffi')
-rw-r--r--library/std/src/ffi/c_str.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/ffi/c_str.rs b/library/std/src/ffi/c_str.rs
index 945bfda1b78..687ed61b959 100644
--- a/library/std/src/ffi/c_str.rs
+++ b/library/std/src/ffi/c_str.rs
@@ -1036,7 +1036,7 @@ impl fmt::Display for NulError {
 impl From<NulError> for io::Error {
     /// Converts a [`NulError`] into a [`io::Error`].
     fn from(_: NulError) -> io::Error {
-        io::Error::new(io::ErrorKind::InvalidInput, "data provided contains a nul byte")
+        io::Error::new_const(io::ErrorKind::InvalidInput, &"data provided contains a nul byte")
     }
 }