diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-03-24 01:52:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 01:52:29 +0100 |
| commit | a42e62fa0a59d0ba620889f97513929a113a6fbd (patch) | |
| tree | c8dabc69676343818b44914550e763ddd18d214d /library/std/src/io/impls.rs | |
| parent | 2f611da1d66ae98b53358bcb7739884524b7e18d (diff) | |
| parent | 6bbcc5bfbbfd9ba5a6d584a753fa32d80e3a7a17 (diff) | |
| download | rust-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/io/impls.rs')
| -rw-r--r-- | library/std/src/io/impls.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/io/impls.rs b/library/std/src/io/impls.rs index 9870cfc4c95..6891bd8a664 100644 --- a/library/std/src/io/impls.rs +++ b/library/std/src/io/impls.rs @@ -263,7 +263,7 @@ impl Read for &[u8] { #[inline] fn read_exact(&mut self, buf: &mut [u8]) -> io::Result<()> { if buf.len() > self.len() { - return Err(Error::new(ErrorKind::UnexpectedEof, "failed to fill whole buffer")); + return Err(Error::new_const(ErrorKind::UnexpectedEof, &"failed to fill whole buffer")); } let (a, b) = self.split_at(buf.len()); @@ -345,7 +345,7 @@ impl Write for &mut [u8] { if self.write(data)? == data.len() { Ok(()) } else { - Err(Error::new(ErrorKind::WriteZero, "failed to write whole buffer")) + Err(Error::new_const(ErrorKind::WriteZero, &"failed to write whole buffer")) } } |
