diff options
| author | Jorge Aparicio <japaricious@gmail.com> | 2016-03-22 22:01:37 -0500 |
|---|---|---|
| committer | Jorge Aparicio <japaricious@gmail.com> | 2016-03-22 22:01:37 -0500 |
| commit | 0f02309e4b0ea05ee905205278fb6d131341c41f (patch) | |
| tree | a259129eeb84705de15b51587ddebd0f82735075 /src/libstd/io | |
| parent | 0dcc413e42f15f4fc51a0ca88a99cc89454ec43d (diff) | |
| download | rust-0f02309e4b0ea05ee905205278fb6d131341c41f.tar.gz rust-0f02309e4b0ea05ee905205278fb6d131341c41f.zip | |
try! -> ?
Automated conversion using the untry tool [1] and the following command: ``` $ find -name '*.rs' -type f | xargs untry ``` at the root of the Rust repo. [1]: https://github.com/japaric/untry
Diffstat (limited to 'src/libstd/io')
| -rw-r--r-- | src/libstd/io/buffered.rs | 18 | ||||
| -rw-r--r-- | src/libstd/io/cursor.rs | 6 | ||||
| -rw-r--r-- | src/libstd/io/impls.rs | 2 | ||||
| -rw-r--r-- | src/libstd/io/mod.rs | 6 | ||||
| -rw-r--r-- | src/libstd/io/util.rs | 2 |
5 files changed, 17 insertions, 17 deletions
diff --git a/src/libstd/io/buffered.rs b/src/libstd/io/buffered.rs index 08877fe9744..632ef3db804 100644 --- a/src/libstd/io/buffered.rs +++ b/src/libstd/io/buffered.rs @@ -172,8 +172,8 @@ impl<R: Read> Read for BufReader<R> { return self.inner.read(buf); } let nread = { - let mut rem = try!(self.fill_buf()); - try!(rem.read(buf)) + let mut rem = self.fill_buf()?; + rem.read(buf)? }; self.consume(nread); Ok(nread) @@ -186,7 +186,7 @@ impl<R: Read> BufRead for BufReader<R> { // If we've reached the end of our internal buffer then we need to fetch // some more data from the underlying reader. if self.pos == self.cap { - self.cap = try!(self.inner.read(&mut self.buf)); + self.cap = self.inner.read(&mut self.buf)?; self.pos = 0; } Ok(&self.buf[self.pos..self.cap]) @@ -237,16 +237,16 @@ impl<R: Seek> Seek for BufReader<R> { // support seeking by i64::min_value() so we need to handle underflow when subtracting // remainder. if let Some(offset) = n.checked_sub(remainder) { - result = try!(self.inner.seek(SeekFrom::Current(offset))); + result = self.inner.seek(SeekFrom::Current(offset))?; } else { // seek backwards by our remainder, and then by the offset - try!(self.inner.seek(SeekFrom::Current(-remainder))); + self.inner.seek(SeekFrom::Current(-remainder))?; self.pos = self.cap; // empty the buffer - result = try!(self.inner.seek(SeekFrom::Current(n))); + result = self.inner.seek(SeekFrom::Current(n))?; } } else { // Seeking with Start/End doesn't care about our buffer length. - result = try!(self.inner.seek(pos)); + result = self.inner.seek(pos)?; } self.pos = self.cap; // empty the buffer Ok(result) @@ -461,7 +461,7 @@ impl<W: Write> BufWriter<W> { impl<W: Write> Write for BufWriter<W> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> { if self.buf.len() + buf.len() > self.buf.capacity() { - try!(self.flush_buf()); + self.flush_buf()?; } if buf.len() >= self.buf.capacity() { self.panicked = true; @@ -761,7 +761,7 @@ impl<W: Write> Write for LineWriter<W> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> { match memchr::memrchr(b'\n', buf) { Some(i) => { - let n = try!(self.inner.write(&buf[..i + 1])); + let n = self.inner.write(&buf[..i + 1])?; if n != i + 1 || self.inner.flush().is_err() { // Do not return errors on partial writes. return Ok(n); diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index 420fede34d2..a1002fdb645 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -213,7 +213,7 @@ impl<T> io::Seek for Cursor<T> where T: AsRef<[u8]> { #[stable(feature = "rust1", since = "1.0.0")] impl<T> Read for Cursor<T> where T: AsRef<[u8]> { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { - let n = try!(Read::read(&mut try!(self.fill_buf()), buf)); + let n = Read::read(&mut self.fill_buf()?, buf)?; self.pos += n as u64; Ok(n) } @@ -232,7 +232,7 @@ impl<T> BufRead for Cursor<T> where T: AsRef<[u8]> { impl<'a> Write for Cursor<&'a mut [u8]> { fn write(&mut self, data: &[u8]) -> io::Result<usize> { let pos = cmp::min(self.pos, self.inner.len() as u64); - let amt = try!((&mut self.inner[(pos as usize)..]).write(data)); + let amt = (&mut self.inner[(pos as usize)..]).write(data)?; self.pos += amt as u64; Ok(amt) } @@ -271,7 +271,7 @@ impl Write for Cursor<Vec<u8>> { impl Write for Cursor<Box<[u8]>> { fn write(&mut self, buf: &[u8]) -> io::Result<usize> { let pos = cmp::min(self.pos, self.inner.len() as u64); - let amt = try!((&mut self.inner[(pos as usize)..]).write(buf)); + let amt = (&mut self.inner[(pos as usize)..]).write(buf)?; self.pos += amt as u64; Ok(amt) } diff --git a/src/libstd/io/impls.rs b/src/libstd/io/impls.rs index ec63f14d453..31799381563 100644 --- a/src/libstd/io/impls.rs +++ b/src/libstd/io/impls.rs @@ -196,7 +196,7 @@ impl<'a> Write for &'a mut [u8] { #[inline] fn write_all(&mut self, data: &[u8]) -> io::Result<()> { - if try!(self.write(data)) == data.len() { + if self.write(data)? == data.len() { Ok(()) } else { Err(Error::new(ErrorKind::WriteZero, "failed to write whole buffer")) diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs index 60a720efb79..28492b30e0f 100644 --- a/src/libstd/io/mod.rs +++ b/src/libstd/io/mod.rs @@ -1433,7 +1433,7 @@ pub struct Chain<T, U> { impl<T: Read, U: Read> Read for Chain<T, U> { fn read(&mut self, buf: &mut [u8]) -> Result<usize> { if !self.done_first { - match try!(self.first.read(buf)) { + match self.first.read(buf)? { 0 => { self.done_first = true; } n => return Ok(n), } @@ -1475,7 +1475,7 @@ impl<T: Read> Read for Take<T> { } let max = cmp::min(buf.len() as u64, self.limit) as usize; - let n = try!(self.inner.read(&mut buf[..max])); + let n = self.inner.read(&mut buf[..max])?; self.limit -= n as u64; Ok(n) } @@ -1484,7 +1484,7 @@ impl<T: Read> Read for Take<T> { #[stable(feature = "rust1", since = "1.0.0")] impl<T: BufRead> BufRead for Take<T> { fn fill_buf(&mut self) -> Result<&[u8]> { - let buf = try!(self.inner.fill_buf()); + let buf = self.inner.fill_buf()?; let cap = cmp::min(buf.len() as u64, self.limit) as usize; Ok(&buf[..cap]) } diff --git a/src/libstd/io/util.rs b/src/libstd/io/util.rs index fddb095f21e..2815c0163d6 100644 --- a/src/libstd/io/util.rs +++ b/src/libstd/io/util.rs @@ -55,7 +55,7 @@ pub fn copy<R: ?Sized, W: ?Sized>(reader: &mut R, writer: &mut W) -> io::Result< Err(ref e) if e.kind() == ErrorKind::Interrupted => continue, Err(e) => return Err(e), }; - try!(writer.write_all(&buf[..len])); + writer.write_all(&buf[..len])?; written += len as u64; } } |
