Make clippy happy

src/content/mod.rs

@@ -224,11 +224,7 @@ impl Content {
 
     /// Returns true if the value is nil.
     pub fn is_nil(&self) -> bool {
-        if let Content::None | Content::Unit = self.resolve_inner() {
-            true
-        } else {
-            false
-        }
+        matches!(self.resolve_inner(), Content::None | Content::Unit)
     }
 
     /// Returns the value as bool

src/glob.rs

@@ -71,7 +71,7 @@ pub fn glob_exec<F: FnMut(&Path)>(base: &Path, pattern: &str, mut f: F) {
             continue;
         }
 
-        settings.set_input_file(&path);
+        settings.set_input_file(path);
         settings.set_snapshot_suffix(path.file_name().unwrap().to_str().unwrap());
 
         settings.bind(|| {

src/redaction.rs

@@ -6,7 +6,7 @@ use std::fmt;
 use crate::content::Content;
 
 #[derive(Debug)]
-pub struct SelectorParseError(pest::error::Error<Rule>);
+pub struct SelectorParseError(Box<pest::error::Error<Rule>>);
 
 impl SelectorParseError {
     /// Return the column of where the error occurred.
@@ -244,6 +244,7 @@ pub struct Selector<'a> {
 impl<'a> Selector<'a> {
     pub fn parse(selector: &'a str) -> Result<Selector<'a>, SelectorParseError> {
         let pair = SelectParser::parse(Rule::selectors, selector)
+            .map_err(Box::new)
             .map_err(SelectorParseError)?
             .next()
             .unwrap();
@@ -262,11 +263,13 @@ impl<'a> Selector<'a> {
                     Rule::wildcard => Segment::Wildcard,
                     Rule::deep_wildcard => {
                         if have_deep_wildcard {
-                            return Err(SelectorParseError(pest::error::Error::new_from_span(
-                                pest::error::ErrorVariant::CustomError {
-                                    message: "deep wildcard used twice".into(),
-                                },
-                                segment_pair.as_span(),
+                            return Err(SelectorParseError(Box::new(
+                                pest::error::Error::new_from_span(
+                                    pest::error::ErrorVariant::CustomError {
+                                        message: "deep wildcard used twice".into(),
+                                    },
+                                    segment_pair.as_span(),
+                                ),
                             )));
                         }
                         have_deep_wildcard = true;

src/runtime.rs

@@ -183,7 +183,7 @@ fn get_snapshot_filename(
                 write!(
                     &mut f,
                     "{}.snap",
-                    snapshot_name.replace('/', "__").replace('\\', "__")
+                    snapshot_name.replace(&['/', '\\'][..], "__")
                 )
                 .unwrap();
                 f

src/settings.rs

@@ -579,7 +579,7 @@ impl Settings {
 
     /// Runs a function with the current settings.
     pub(crate) fn with<R, F: FnOnce(&Settings) -> R>(f: F) -> R {
-        CURRENT_SETTINGS.with(|x| f(&*x.borrow()))
+        CURRENT_SETTINGS.with(|x| f(&x.borrow()))
     }
 }
 

src/snapshot.rs

@@ -57,7 +57,7 @@ impl PendingInlineSnapshot {
     }
 
     pub fn save_batch(p: &Path, batch: &[PendingInlineSnapshot]) -> Result<(), Box<dyn Error>> {
-        fs::remove_file(&p).ok();
+        fs::remove_file(p).ok();
         for snap in batch {
             snap.save(p)?;
         }
@@ -426,9 +426,9 @@ impl Snapshot {
 
     fn save_with_metadata(&self, path: &Path, md: &MetaData) -> Result<(), Box<dyn Error>> {
         if let Some(folder) = path.parent() {
-            fs::create_dir_all(&folder)?;
+            fs::create_dir_all(folder)?;
         }
-        let mut f = fs::File::create(&path)?;
+        let mut f = fs::File::create(path)?;
         let blob = yaml::to_string(&md.as_content());
         f.write_all(blob.as_bytes())?;
         f.write_all(b"---\n")?;
@@ -604,9 +604,8 @@ fn get_inline_snapshot_value(frozen_value: &str) -> String {
                 }
             }
             if let Some(remainder) = line.get(indentation..) {
-                if remainder.starts_with('⋮') {
-                    // 3 because '⋮' is three utf-8 bytes long
-                    buf.push_str(&remainder[3..]);
+                if let Some(rest) = remainder.strip_prefix('⋮') {
+                    buf.push_str(rest);
                     buf.push('\n');
                 } else if remainder.trim().is_empty() {
                     continue;