cleanup: replace try! with ?

2 files changed, 13 insertions, 15 deletions

diff --git a/grep/src/nonl.rs b/grep/src/nonl.rs
index 16fc103d..361b0b00 100644
--- a/grep/src/nonl.rs
+++ b/grep/src/nonl.rs
@@ -44,25 +44,23 @@ pub fn remove(expr: Expr, byte: u8) -> Result<Expr> {
         }
         Group { e, i, name } => {
             Group {
-                e: Box::new(try!(remove(*e, byte))),
+                e: Box::new(remove(*e, byte)?),
                 i: i,
                 name: name,
             }
         }
         Repeat { e, r, greedy } => {
             Repeat {
-                e: Box::new(try!(remove(*e, byte))),
+                e: Box::new(remove(*e, byte)?),
                 r: r,
                 greedy: greedy,
             }
         }
         Concat(exprs) => {
-            Concat(try!(
-                exprs.into_iter().map(|e| remove(e, byte)).collect()))
+            Concat(exprs.into_iter().map(|e| remove(e, byte)).collect::<Result<Vec<Expr>>>()?)
         }
         Alternate(exprs) => {
-            Alternate(try!(
-                exprs.into_iter().map(|e| remove(e, byte)).collect()))
+            Alternate(exprs.into_iter().map(|e| remove(e, byte)).collect::<Result<Vec<Expr>>>()?)
         }
         e => e,
     })
diff --git a/grep/src/search.rs b/grep/src/search.rs
index 9942f58a..8d056796 100644
--- a/grep/src/search.rs
+++ b/grep/src/search.rs
@@ -141,11 +141,11 @@ impl GrepBuilder {
     /// If there was a problem parsing or compiling the regex with the given
     /// options, then an error is returned.
     pub fn build(self) -> Result<Grep> {
-        let expr = try!(self.parse());
+        let expr = self.parse()?;
         let literals = LiteralSets::create(&expr);
-        let re = try!(self.regex(&expr));
+        let re = self.regex(&expr)?;
         let required = match literals.to_regex_builder() {
-            Some(builder) => Some(try!(self.regex_build(builder))),
+            Some(builder) => Some(self.regex_build(builder)?),
             None => {
                 match strip_unicode_word_boundaries(&expr) {
                     None => None,
@@ -186,12 +186,12 @@ impl GrepBuilder {
     /// the line terminator.
     fn parse(&self) -> Result<syntax::Expr> {
         let expr =
-            try!(syntax::ExprBuilder::new()
-                 .allow_bytes(true)
-                 .unicode(true)
-                 .case_insensitive(try!(self.is_case_insensitive()))
-                 .parse(&self.pattern));
-        let expr = try!(nonl::remove(expr, self.opts.line_terminator));
+            syntax::ExprBuilder::new()
+            .allow_bytes(true)
+            .unicode(true)
+            .case_insensitive(self.is_case_insensitive()?)
+            .parse(&self.pattern)?;
+        let expr = nonl::remove(expr, self.opts.line_terminator)?;
         debug!("regex ast:\n{:#?}", expr);
         Ok(expr)
     }