From de9ee5afd4ec8d3a4b0835b865d7f10c3bf8bb8e Mon Sep 17 00:00:00 2001
From: Daniel Silverstone <dsilvers@digital-scurf.org>
Date: Fri, 9 Apr 2021 18:37:19 +0100
Subject: chore: Clear some clippy lints

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>
---
 src/bindings.rs | 4 ++--
 src/codegen.rs  | 4 ++--
 src/doc.rs      | 5 ++---
 src/typeset.rs  | 5 +----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/bindings.rs b/src/bindings.rs
index fe26690..99fd6cf 100644
--- a/src/bindings.rs
+++ b/src/bindings.rs
@@ -557,14 +557,14 @@ fn from_hashmap(parsed: &ParsedBinding) -> Result<Binding> {
         regex_from_simple_pattern(pattern, parsed.regex.is_some(), &mut types)?
     };
 
-    Ok(Binding::new(
+    Binding::new(
         kind,
         &pattern,
         &parsed.function,
         parsed.cleanup.as_deref(),
         parsed.case_sensitive,
         types,
-    )?)
+    )
 }
 
 #[cfg(test)]
diff --git a/src/codegen.rs b/src/codegen.rs
index 91f3358..588fe1b 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -21,8 +21,8 @@ pub fn template_spec(doc: &Document) -> Result<TemplateSpec> {
     let mut filename = PathBuf::from(template);
     filename.push("template");
     filename.push("template.yaml");
-    Ok(TemplateSpec::from_file(&filename)
-        .with_context(|| format!("Failed to read template file: {}", filename.display()))?)
+    TemplateSpec::from_file(&filename)
+        .with_context(|| format!("Failed to read template file: {}", filename.display()))
 }
 
 /// Generate a test program from a document, using a template spec.
diff --git a/src/doc.rs b/src/doc.rs
index c9296d2..6812915 100644
--- a/src/doc.rs
+++ b/src/doc.rs
@@ -317,11 +317,10 @@ impl<'a> Document {
     pub fn matched_scenarios(&mut self) -> Result<Vec<MatchedScenario>> {
         let scenarios = self.scenarios()?;
         let bindings = self.meta().bindings();
-        let vec: Result<Vec<MatchedScenario>> = scenarios
+        scenarios
             .iter()
             .map(|scen| MatchedScenario::new(scen, bindings))
-            .collect();
-        Ok(vec?)
+            .collect()
     }
 }
 
diff --git a/src/typeset.rs b/src/typeset.rs
index a30df6f..ca257a9 100644
--- a/src/typeset.rs
+++ b/src/typeset.rs
@@ -92,10 +92,7 @@ fn step(
         }
     };
 
-    let mut inlines = Vec::new();
-
-    inlines.push(keyword(&step));
-    inlines.push(space());
+    let mut inlines = vec![keyword(&step), space()];
 
     for part in m.parts() {
         match part {
-- 
cgit v1.2.1