chore: Fix unnecessary borrow lints

Signed-off-by: Daniel Silverstone <dsilvers@digital-scurf.org>

13 files changed, 27 insertions, 31 deletions

diff --git a/src/bin/cli/mod.rs b/src/bin/cli/mod.rs
index 0008a16..c686cab 100644
--- a/src/bin/cli/mod.rs
+++ b/src/bin/cli/mod.rs
@@ -52,21 +52,21 @@ impl TryFrom<&mut Document> for Metadata {
             .meta()
             .bindings_filenames()
             .into_iter()
-            .map(|p| filename(Some(&p)))
+            .map(|p| filename(Some(p)))
             .collect();
         binding_files.sort_unstable();
         let mut function_files: Vec<_> = doc
             .meta()
             .functions_filenames()
             .into_iter()
-            .map(|p| filename(Some(&p)))
+            .map(|p| filename(Some(p)))
             .collect();
         function_files.sort_unstable();
         let mut bibliographies: Vec<_> = doc
             .meta()
             .bibliographies()
             .into_iter()
-            .map(|p| filename(Some(&p)))
+            .map(|p| filename(Some(p)))
             .collect();
         bibliographies.sort_unstable();
         let mut scenarios: Vec<_> = doc
diff --git a/src/bindings.rs b/src/bindings.rs
index 2e927cd..98de428 100644
--- a/src/bindings.rs
+++ b/src/bindings.rs
@@ -618,7 +618,7 @@ mod test_bindings {
     total: word
 ";
         let mut bindings = Bindings::new();
-        bindings.add_from_yaml(&yaml).unwrap();
+        bindings.add_from_yaml(yaml).unwrap();
         println!("test: {:?}", bindings);
         assert!(bindings.has(StepKind::Given, "I am Tomjon"));
         assert!(bindings.has(StepKind::When, "I declare myself king"));
@@ -636,7 +636,7 @@ mod test_bindings {
   wheN: I am indeed Tomjon
   FUNCTION: set_name
 ";
-        match Bindings::new().add_from_yaml(&yaml) {
+        match Bindings::new().add_from_yaml(yaml) {
             Ok(_) => unreachable!(),
             Err(SubplotError::BindingHasManyKeywords(_)) => (),
             Err(e) => panic!("Incorrect error: {}", e),
@@ -651,7 +651,7 @@ mod test_bindings {
   types:
     age: number
 ";
-        match Bindings::new().add_from_yaml(&yaml) {
+        match Bindings::new().add_from_yaml(yaml) {
             Ok(_) => unreachable!(),
             Err(SubplotError::SimplePatternKindMismatch(_)) => (),
             Err(e) => panic!("Incorrect error: {}", e),
diff --git a/src/codegen.rs b/src/codegen.rs
index efb4081..d27a4d8 100644
--- a/src/codegen.rs
+++ b/src/codegen.rs
@@ -29,7 +29,7 @@ pub fn generate_test_program(
     filename: &Path,
 ) -> Result<(), SubplotError> {
     let context = context(doc)?;
-    let code = tera(&spec)?.render("template", &context).expect("render");
+    let code = tera(spec)?.render("template", &context).expect("render");
     write(filename, &code)?;
     Ok(())
 }
@@ -54,7 +54,7 @@ fn context(doc: &mut Document) -> Result<Context, SubplotError> {
 fn tera(tmplspec: &TemplateSpec) -> Result<Tera, SubplotError> {
     // Tera insists on a glob, but we want to load a specific template
     // only, so we use a glob that doesn't match anything.
-    let mut tera = Tera::new(&"/..IGNORE-THIS../..SUBPLOT-TERA-NOT-EXIST../*").expect("new");
+    let mut tera = Tera::new("/..IGNORE-THIS../..SUBPLOT-TERA-NOT-EXIST../*").expect("new");
     tera.register_filter("base64", base64);
     tera.register_filter("nameslug", nameslug);
     tera.register_filter("commentsafe", commentsafe);
@@ -76,7 +76,7 @@ fn tera(tmplspec: &TemplateSpec) -> Result<Tera, SubplotError> {
 
 fn write(filename: &Path, content: &str) -> Result<(), SubplotError> {
     let mut f: File = File::create(filename)?;
-    f.write_all(&content.as_bytes())?;
+    f.write_all(content.as_bytes())?;
     Ok(())
 }
 
diff --git a/src/doc.rs b/src/doc.rs
index 6812915..61e60a5 100644
--- a/src/doc.rs
+++ b/src/doc.rs
@@ -291,7 +291,7 @@ impl<'a> Document {
     /// Typeset a Subplot document.
     pub fn typeset(&mut self) {
         let mut visitor =
-            visitor::TypesettingVisitor::new(self.style.clone(), &self.meta.bindings());
+            visitor::TypesettingVisitor::new(self.style.clone(), self.meta.bindings());
         visitor.walk_pandoc(&mut self.ast);
     }
 
@@ -333,7 +333,7 @@ fn extract_scenario(e: &[visitor::Element]) -> Result<(Option<Scenario>, usize)>
     match &e[0] {
         visitor::Element::Snippet(_) => Err(SubplotError::ScenarioBeforeHeading),
         visitor::Element::Heading(title, level) => {
-            let mut scen = Scenario::new(&title);
+            let mut scen = Scenario::new(title);
             let mut prevkind = None;
             for (i, item) in e.iter().enumerate().skip(1) {
                 match item {
@@ -351,7 +351,7 @@ fn extract_scenario(e: &[visitor::Element]) -> Result<(Option<Scenario>, usize)>
                         }
                     }
                     visitor::Element::Snippet(text) => {
-                        for line in parse_scenario_snippet(&text) {
+                        for line in parse_scenario_snippet(text) {
                             let step = ScenarioStep::new_from_str(line, prevkind)?;
                             scen.add(&step);
                             prevkind = Some(step.kind());
diff --git a/src/matches.rs b/src/matches.rs
index 88d2c55..f6d10b9 100644
--- a/src/matches.rs
+++ b/src/matches.rs
@@ -50,11 +50,7 @@ impl MatchedSteps {
 
 impl std::fmt::Display for MatchedSteps {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> {
-        let matches: Vec<String> = self
-            .matches
-            .iter()
-            .map(|m| format!("{}", m.pattern()))
-            .collect();
+        let matches: Vec<String> = self.matches.iter().map(|m| m.pattern()).collect();
         write!(f, "{}", matches.join("\n"))
     }
 }
@@ -160,7 +156,7 @@ impl PartialStep {
     fn as_text(&self) -> &str {
         match self {
             PartialStep::UncapturedText(snippet) => snippet.text(),
-            PartialStep::CapturedText { text, .. } => &text,
+            PartialStep::CapturedText { text, .. } => text,
         }
     }
 }
diff --git a/src/metadata.rs b/src/metadata.rs
index 8406e38..c598bb0 100644
--- a/src/metadata.rs
+++ b/src/metadata.rs
@@ -158,7 +158,7 @@ fn get_string(map: &Mapp, field: &str) -> Option<String> {
     };
     let v = match v {
         pandoc_ast::MetaValue::MetaString(s) => s.to_string(),
-        pandoc_ast::MetaValue::MetaInlines(vec) => join(&vec),
+        pandoc_ast::MetaValue::MetaInlines(vec) => join(vec),
         _ => panic!("don't know how to handle: {:?}", v),
     };
     Some(v)
@@ -195,7 +195,7 @@ fn get_classes(map: &Mapp) -> Vec<String> {
 fn push_strings(v: &MetaValue, strings: &mut Vec<String>) {
     match v {
         MetaValue::MetaString(s) => strings.push(s.to_string()),
-        MetaValue::MetaInlines(vec) => strings.push(join(&vec)),
+        MetaValue::MetaInlines(vec) => strings.push(join(vec)),
         MetaValue::MetaList(values) => {
             for value in values {
                 push_strings(value, strings);
@@ -211,7 +211,7 @@ where
 {
     match v {
         MetaValue::MetaString(s) => bufs.push(basedir.as_ref().join(Path::new(s))),
-        MetaValue::MetaInlines(vec) => bufs.push(basedir.as_ref().join(Path::new(&join(&vec)))),
+        MetaValue::MetaInlines(vec) => bufs.push(basedir.as_ref().join(Path::new(&join(vec)))),
         MetaValue::MetaList(values) => {
             for value in values {
                 push_pathbufs(basedir.as_ref(), value, bufs);
@@ -230,7 +230,7 @@ fn join(vec: &[Inline]) -> String {
 fn join_into_buffer(vec: &[Inline], buf: &mut String) {
     for item in vec {
         match item {
-            pandoc_ast::Inline::Str(s) => buf.push_str(&s),
+            pandoc_ast::Inline::Str(s) => buf.push_str(s),
             pandoc_ast::Inline::Emph(v) => join_into_buffer(v, buf),
             pandoc_ast::Inline::Strong(v) => join_into_buffer(v, buf),
             pandoc_ast::Inline::Strikeout(v) => join_into_buffer(v, buf),
diff --git a/src/templatespec.rs b/src/templatespec.rs
index e997aad..b64d282 100644
--- a/src/templatespec.rs
+++ b/src/templatespec.rs
@@ -52,7 +52,7 @@ impl TemplateSpec {
             }
         };
         Ok(TemplateSpec::new(
-            &dirname,
+            dirname,
             spec.template_filename(),
             spec.helpers().map(|p| p.to_path_buf()).collect(),
             spec.run(),
diff --git a/src/typeset.rs b/src/typeset.rs
index ca257a9..73cc1a2 100644
--- a/src/typeset.rs
+++ b/src/typeset.rs
@@ -97,7 +97,7 @@ fn step(
     for part in m.parts() {
         match part {
             PartialStep::UncapturedText(s) => inlines.push(uncaptured(s.text())),
-            PartialStep::CapturedText { text, .. } => inlines.push(captured(&text)),
+            PartialStep::CapturedText { text, .. } => inlines.push(captured(text)),
         }
     }
 
diff --git a/src/visitor/datafiles.rs b/src/visitor/datafiles.rs
index bc6961d..53ab7bb 100644
--- a/src/visitor/datafiles.rs
+++ b/src/visitor/datafiles.rs
@@ -11,7 +11,7 @@ impl MutVisitor for DataFiles {
             match block {
                 Block::CodeBlock(attr, contents) => {
                     if is_class(attr, "file") {
-                        let add_newline = match panhelper::find_attr_kv(&attr, "add-newline").next()
+                        let add_newline = match panhelper::find_attr_kv(attr, "add-newline").next()
                         {
                             None | Some("auto") => !contents.ends_with('\n'),
                             Some("yes") => true,
diff --git a/src/visitor/linting.rs b/src/visitor/linting.rs
index a5171f9..03b49ee 100644
--- a/src/visitor/linting.rs
+++ b/src/visitor/linting.rs
@@ -15,18 +15,18 @@ impl MutVisitor for LintingVisitor {
                 Block::CodeBlock(attr, _) => {
                     if panhelper::is_class(attr, "file") {
                         let newlines: Vec<_> =
-                            panhelper::find_attr_kv(&attr, "add-newline").collect();
+                            panhelper::find_attr_kv(attr, "add-newline").collect();
                         match newlines.len() {
                             0 => {}
                             1 => match newlines[0].to_ascii_lowercase().as_ref() {
                                 "auto" | "yes" | "no" => {}
                                 _ => self.issues.push(SubplotError::UnrecognisedAddNewline(
-                                    panhelper::get_filename(&attr),
+                                    panhelper::get_filename(attr),
                                     newlines[0].to_owned(),
                                 )),
                             },
                             _ => self.issues.push(SubplotError::RepeatedAddNewlineAttribute(
-                                panhelper::get_filename(&attr),
+                                panhelper::get_filename(attr),
                             )),
                         }
                     }
diff --git a/src/visitor/structure.rs b/src/visitor/structure.rs
index a9d7c3f..f5693a6 100644
--- a/src/visitor/structure.rs
+++ b/src/visitor/structure.rs
@@ -66,7 +66,7 @@ fn join(vec: &[Inline]) -> String {
 fn join_into_buffer(vec: &[Inline], buf: &mut String) {
     for item in vec {
         match item {
-            Inline::Str(s) => buf.push_str(&s),
+            Inline::Str(s) => buf.push_str(s),
             Inline::Emph(v) => join_into_buffer(v, buf),
             Inline::Strong(v) => join_into_buffer(v, buf),
             Inline::Strikeout(v) => join_into_buffer(v, buf),
diff --git a/src/visitor/typesetting.rs b/src/visitor/typesetting.rs
index e98d66a..e29a434 100644
--- a/src/visitor/typesetting.rs
+++ b/src/visitor/typesetting.rs
@@ -30,7 +30,7 @@ impl<'a> MutVisitor for TypesettingVisitor<'a> {
             match block {
                 Block::CodeBlock(attr, s) => {
                     if is_class(attr, "scenario") {
-                        *block = typeset::scenario_snippet(&self.bindings, s)
+                        *block = typeset::scenario_snippet(self.bindings, s)
                     } else if is_class(attr, "file") {
                         *block = typeset::file_block(attr, s)
                     } else if is_class(attr, "dot") {
diff --git a/subplotlib-derive/src/lib.rs b/subplotlib-derive/src/lib.rs
index 160643d..ac19f73 100644
--- a/subplotlib-derive/src/lib.rs
+++ b/subplotlib-derive/src/lib.rs
@@ -239,7 +239,7 @@ fn process_step(mut input: ItemFn) -> proc_macro2::TokenStream {
         let structfields: Vec<_> = fields
             .iter()
             .map(|(id, ty)| {
-                let ty = if ty_is_borrow_str(&ty) {
+                let ty = if ty_is_borrow_str(ty) {
                     parse_quote!(::std::string::String)
                 } else {
                     ty.clone()