Remove unnecessary map_err
This commit is contained in:
parent
e49cd1c578
commit
aa581f0a0a
@ -261,7 +261,7 @@ pub fn read<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {
|
|||||||
let mut file = File::open(path)?;
|
let mut file = File::open(path)?;
|
||||||
let size = file.metadata().map(|m| m.len() as usize).ok();
|
let size = file.metadata().map(|m| m.len() as usize).ok();
|
||||||
let mut bytes = Vec::new();
|
let mut bytes = Vec::new();
|
||||||
bytes.try_reserve_exact(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
|
bytes.try_reserve_exact(size.unwrap_or(0))?;
|
||||||
io::default_read_to_end(&mut file, &mut bytes, size)?;
|
io::default_read_to_end(&mut file, &mut bytes, size)?;
|
||||||
Ok(bytes)
|
Ok(bytes)
|
||||||
}
|
}
|
||||||
@ -304,7 +304,7 @@ pub fn read_to_string<P: AsRef<Path>>(path: P) -> io::Result<String> {
|
|||||||
let mut file = File::open(path)?;
|
let mut file = File::open(path)?;
|
||||||
let size = file.metadata().map(|m| m.len() as usize).ok();
|
let size = file.metadata().map(|m| m.len() as usize).ok();
|
||||||
let mut string = String::new();
|
let mut string = String::new();
|
||||||
string.try_reserve_exact(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
|
string.try_reserve_exact(size.unwrap_or(0))?;
|
||||||
io::default_read_to_string(&mut file, &mut string, size)?;
|
io::default_read_to_string(&mut file, &mut string, size)?;
|
||||||
Ok(string)
|
Ok(string)
|
||||||
}
|
}
|
||||||
@ -777,14 +777,14 @@ impl Read for &File {
|
|||||||
// Reserves space in the buffer based on the file size when available.
|
// Reserves space in the buffer based on the file size when available.
|
||||||
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
||||||
let size = buffer_capacity_required(self);
|
let size = buffer_capacity_required(self);
|
||||||
buf.try_reserve(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
|
buf.try_reserve(size.unwrap_or(0))?;
|
||||||
io::default_read_to_end(self, buf, size)
|
io::default_read_to_end(self, buf, size)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reserves space in the buffer based on the file size when available.
|
// Reserves space in the buffer based on the file size when available.
|
||||||
fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {
|
fn read_to_string(&mut self, buf: &mut String) -> io::Result<usize> {
|
||||||
let size = buffer_capacity_required(self);
|
let size = buffer_capacity_required(self);
|
||||||
buf.try_reserve(size.unwrap_or(0)).map_err(|_| io::ErrorKind::OutOfMemory)?;
|
buf.try_reserve(size.unwrap_or(0))?;
|
||||||
io::default_read_to_string(self, buf, size)
|
io::default_read_to_string(self, buf, size)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -344,7 +344,7 @@ impl<R: ?Sized + Read> Read for BufReader<R> {
|
|||||||
// delegate to the inner implementation.
|
// delegate to the inner implementation.
|
||||||
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
||||||
let inner_buf = self.buffer();
|
let inner_buf = self.buffer();
|
||||||
buf.try_reserve(inner_buf.len()).map_err(|_| io::ErrorKind::OutOfMemory)?;
|
buf.try_reserve(inner_buf.len())?;
|
||||||
buf.extend_from_slice(inner_buf);
|
buf.extend_from_slice(inner_buf);
|
||||||
let nread = inner_buf.len();
|
let nread = inner_buf.len();
|
||||||
self.discard_buffer();
|
self.discard_buffer();
|
||||||
|
@ -304,7 +304,7 @@ impl Read for &[u8] {
|
|||||||
#[inline]
|
#[inline]
|
||||||
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
||||||
let len = self.len();
|
let len = self.len();
|
||||||
buf.try_reserve(len).map_err(|_| ErrorKind::OutOfMemory)?;
|
buf.try_reserve(len)?;
|
||||||
buf.extend_from_slice(*self);
|
buf.extend_from_slice(*self);
|
||||||
*self = &self[len..];
|
*self = &self[len..];
|
||||||
Ok(len)
|
Ok(len)
|
||||||
@ -452,7 +452,7 @@ impl<A: Allocator> Read for VecDeque<u8, A> {
|
|||||||
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
fn read_to_end(&mut self, buf: &mut Vec<u8>) -> io::Result<usize> {
|
||||||
// The total len is known upfront so we can reserve it in a single call.
|
// The total len is known upfront so we can reserve it in a single call.
|
||||||
let len = self.len();
|
let len = self.len();
|
||||||
buf.try_reserve(len).map_err(|_| ErrorKind::OutOfMemory)?;
|
buf.try_reserve(len)?;
|
||||||
|
|
||||||
let (front, back) = self.as_slices();
|
let (front, back) = self.as_slices();
|
||||||
buf.extend_from_slice(front);
|
buf.extend_from_slice(front);
|
||||||
|
@ -465,7 +465,7 @@ pub(crate) fn default_read_to_end<R: Read + ?Sized>(
|
|||||||
|
|
||||||
if buf.len() == buf.capacity() {
|
if buf.len() == buf.capacity() {
|
||||||
// buf is full, need more space
|
// buf is full, need more space
|
||||||
buf.try_reserve(PROBE_SIZE).map_err(|_| ErrorKind::OutOfMemory)?;
|
buf.try_reserve(PROBE_SIZE)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut spare = buf.spare_capacity_mut();
|
let mut spare = buf.spare_capacity_mut();
|
||||||
@ -834,7 +834,7 @@ pub trait Read {
|
|||||||
/// if src_buf.is_empty() {
|
/// if src_buf.is_empty() {
|
||||||
/// break;
|
/// break;
|
||||||
/// }
|
/// }
|
||||||
/// dest_vec.try_reserve(src_buf.len()).map_err(|_| io::ErrorKind::OutOfMemory)?;
|
/// dest_vec.try_reserve(src_buf.len())?;
|
||||||
/// dest_vec.extend_from_slice(src_buf);
|
/// dest_vec.extend_from_slice(src_buf);
|
||||||
///
|
///
|
||||||
/// // Any irreversible side effects should happen after `try_reserve` succeeds,
|
/// // Any irreversible side effects should happen after `try_reserve` succeeds,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user