summaryrefslogtreecommitdiffstats
path: root/src/search_stream.rs
diff options
context:
space:
mode:
authorBalaji Sivaraman <balaji@balajisivaraman.com>2018-01-01 19:52:35 +0530
committerAndrew Gallant <jamslam@gmail.com>2018-01-01 09:22:35 -0500
commitb6177f0459044a7e3fb882ecda9c80e44e4d95de (patch)
tree281e058e4fbe87c6293ea5260d4f798a05ce7b4d /src/search_stream.rs
parentba1023e1e45d7bd6edffa43d06c9613d3b84de8f (diff)
cleanup: replace try! with ?
Diffstat (limited to 'src/search_stream.rs')
-rw-r--r--src/search_stream.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/search_stream.rs b/src/search_stream.rs
index 4e167121..3d8396cb 100644
--- a/src/search_stream.rs
+++ b/src/search_stream.rs
@@ -264,7 +264,7 @@ impl<'a, R: io::Read, W: WriteColor> Searcher<'a, R, W> {
while !self.terminate() {
let upto = self.inp.lastnl;
self.print_after_context(upto);
- if !try!(self.fill()) {
+ if !self.fill()? {
break;
}
while !self.terminate() && self.inp.pos < self.inp.lastnl {
@@ -301,7 +301,7 @@ impl<'a, R: io::Read, W: WriteColor> Searcher<'a, R, W> {
}
if self.after_context_remaining > 0 {
if self.last_printed == self.inp.lastnl {
- try!(self.fill());
+ self.fill()?;
}
let upto = self.inp.lastnl;
if upto > 0 {
@@ -349,9 +349,9 @@ impl<'a, R: io::Read, W: WriteColor> Searcher<'a, R, W> {
self.count_lines(keep);
self.last_line = 0;
}
- let ok = try!(self.inp.fill(&mut self.haystack, keep).map_err(|err| {
+ let ok = self.inp.fill(&mut self.haystack, keep).map_err(|err| {
Error::from_io(err, &self.path)
- }));
+ })?;
Ok(ok)
}
@@ -595,8 +595,8 @@ impl InputBuffer {
let new_len = cmp::max(min_len, self.buf.len() * 2);
self.buf.resize(new_len, 0);
}
- let n = try!(rdr.read(
- &mut self.buf[self.end..self.end + self.read_size]));
+ let n = rdr.read(
+ &mut self.buf[self.end..self.end + self.read_size])?;
if !self.text {
if is_binary(&self.buf[self.end..self.end + n], self.first) {
return Ok(false);