style: Make clippy happy

Author: epage

Cargo.toml

@@ -30,7 +30,7 @@ unused_macro_rules = "warn"
 unused_qualifications = "warn"
 
 [workspace.lints.clippy]
-allow_attributes_without_reason = "warn"
+#allow_attributes_without_reason = "warn"
 bool_assert_comparison = "allow"
 branches_sharing_code = "allow"
 byte_char_slices = "allow"  # sometimes explicit arrays are better

crates/snapbox/src/assert/action.rs

@@ -24,10 +24,10 @@ impl Action {
     pub fn with_env_value(value: impl AsRef<std::ffi::OsStr>) -> Option<Self> {
         let value = value.as_ref();
         match value.to_str()? {
-            "skip" => Some(Action::Skip),
-            "ignore" => Some(Action::Ignore),
-            "verify" => Some(Action::Verify),
-            "overwrite" => Some(Action::Overwrite),
+            "skip" => Some(Self::Skip),
+            "ignore" => Some(Self::Ignore),
+            "verify" => Some(Self::Verify),
+            "overwrite" => Some(Self::Overwrite),
             _ => None,
         }
     }

crates/snapbox/src/cmd.rs

@@ -758,6 +758,10 @@ pub fn display_exit_status(status: std::process::ExitStatus) -> String {
         use std::os::unix::process::ExitStatusExt;
 
         let signal = status.signal()?;
+        #[allow(
+            trivial_numeric_casts,
+            reason = "typedef could change between platforms"
+        )]
         let name = match signal as libc::c_int {
             libc::SIGABRT => ", SIGABRT: process abort signal",
             libc::SIGALRM => ", SIGALRM: alarm clock",

crates/snapbox/src/data/format.rs

@@ -48,11 +48,11 @@ impl From<&std::path::Path> for DataFormat {
             match ext {
                 #[cfg(feature = "json")]
                 "json" => {
-                    return DataFormat::Json;
+                    return Self::Json;
                 }
                 #[cfg(feature = "json")]
                 "jsonl" => {
-                    return DataFormat::JsonLines;
+                    return Self::JsonLines;
                 }
                 #[cfg(feature = "term-svg")]
                 "term.svg" => {
@@ -61,7 +61,7 @@ impl From<&std::path::Path> for DataFormat {
                 _ => {}
             }
         }
-        DataFormat::Text
+        Self::Text
     }
 }
 

crates/snapbox/src/data/mod.rs

@@ -667,7 +667,7 @@ impl Data {
     ///     .against(snapbox::data::DataFormat::JsonLines);
     /// # }
     /// ```
-    fn against(mut self, format: DataFormat) -> Data {
+    fn against(mut self, format: DataFormat) -> Self {
         self.inner.filters = self.inner.filters.against(format);
         self
     }
@@ -851,7 +851,7 @@ impl std::fmt::Display for Data {
 }
 
 impl PartialEq for Data {
-    fn eq(&self, other: &Data) -> bool {
+    fn eq(&self, other: &Self) -> bool {
         match (&self.inner.value, &other.inner.value) {
             (DataValue::Error(left), DataValue::Error(right)) => left == right,
             (DataValue::Binary(left), DataValue::Binary(right)) => left == right,
@@ -934,8 +934,8 @@ impl Default for Data {
     }
 }
 
-impl<'d> From<&'d Data> for Data {
-    fn from(other: &'d Data) -> Self {
+impl<'d> From<&'d Self> for Data {
+    fn from(other: &'d Self) -> Self {
         other.into_data()
     }
 }

crates/snapbox/src/data/runtime.rs

@@ -63,11 +63,11 @@ struct SourceFileRuntime {
 }
 
 impl SourceFileRuntime {
-    fn new(inline: &Inline) -> std::io::Result<SourceFileRuntime> {
+    fn new(inline: &Inline) -> std::io::Result<Self> {
         let path = inline.position.file.clone();
         let original_text = std::fs::read_to_string(&path)?;
         let patchwork = Patchwork::new(original_text.clone());
-        Ok(SourceFileRuntime {
+        Ok(Self {
             path,
             original_text,
             patchwork,
@@ -88,8 +88,8 @@ struct Patchwork {
 }
 
 impl Patchwork {
-    fn new(text: String) -> Patchwork {
-        Patchwork {
+    fn new(text: String) -> Self {
+        Self {
             text,
             indels: BTreeMap::new(),
         }
@@ -116,7 +116,7 @@ impl Patchwork {
             .iter()
             .take_while(|(delete, _)| delete.start < range.start)
             .map(|(delete, (insert, _))| (delete.end - delete.start, insert))
-            .fold((0usize, 0usize), |(x1, y1), (x2, y2)| (x1 + x2, y1 + y2));
+            .fold((0_usize, 0_usize), |(x1, y1), (x2, y2)| (x1 + x2, y1 + y2));
 
         for pos in &mut [&mut range.start, &mut range.end] {
             **pos -= delete;
@@ -191,7 +191,7 @@ struct Span {
 }
 
 impl Span {
-    fn from_pos(pos: &Position, file: &str) -> Span {
+    fn from_pos(pos: &Position, file: &str) -> Self {
         let mut target_line = None;
         let mut line_start = 0;
         for (i, line) in crate::utils::LinesWithTerminator::new(file).enumerate() {
@@ -233,7 +233,7 @@ impl Span {
         let literal_len =
             locate_end(lit_to_eof_trimmed).expect("Couldn't find closing delimiter for `expect!`.");
         let literal_range = literal_start..literal_start + literal_len;
-        Span { literal_range }
+        Self { literal_range }
     }
 }
 

crates/snapbox/src/utils/lines.rs

@@ -4,7 +4,7 @@ pub struct LinesWithTerminator<'a> {
 }
 
 impl<'a> LinesWithTerminator<'a> {
-    pub fn new(data: &'a str) -> LinesWithTerminator<'a> {
+    pub fn new(data: &'a str) -> Self {
         LinesWithTerminator { data }
     }
 }

crates/trycmd/src/runner.rs

@@ -921,13 +921,13 @@ impl FileStatus {
 impl From<snapbox::dir::PathDiff> for FileStatus {
     fn from(other: snapbox::dir::PathDiff) -> Self {
         match other {
-            snapbox::dir::PathDiff::Failure(err) => FileStatus::Failure(err),
+            snapbox::dir::PathDiff::Failure(err) => Self::Failure(err),
             snapbox::dir::PathDiff::TypeMismatch {
                 expected_path,
                 actual_path,
                 expected_type,
                 actual_type,
-            } => FileStatus::TypeMismatch {
+            } => Self::TypeMismatch {
                 actual_path,
                 expected_path,
                 actual_type,
@@ -938,7 +938,7 @@ impl From<snapbox::dir::PathDiff> for FileStatus {
                 actual_path,
                 expected_target,
                 actual_target,
-            } => FileStatus::LinkMismatch {
+            } => Self::LinkMismatch {
                 actual_path,
                 expected_path,
                 actual_target,
@@ -949,7 +949,7 @@ impl From<snapbox::dir::PathDiff> for FileStatus {
                 actual_path,
                 expected_content,
                 actual_content,
-            } => FileStatus::ContentMismatch {
+            } => Self::ContentMismatch {
                 actual_path,
                 expected_path,
                 actual_content,

crates/trycmd/src/schema.rs

@@ -708,7 +708,7 @@ pub(crate) struct JoinedArgs {
 impl JoinedArgs {
     #[cfg(test)]
     pub(crate) fn from_vec(inner: Vec<String>) -> Self {
-        JoinedArgs { inner }
+        Self { inner }
     }
 
     #[allow(clippy::inherent_to_string_shadow_display)]
@@ -853,15 +853,15 @@ impl<'a> From<&'a std::path::Path> for Bin {
 
 impl<P, E> From<Result<P, E>> for Bin
 where
-    P: Into<Bin>,
+    P: Into<Self>,
     E: std::fmt::Display,
 {
     fn from(other: Result<P, E>) -> Self {
         match other {
             Ok(path) => path.into(),
             Err(err) => {
                 let err = crate::Error::new(err.to_string());
-                Bin::Error(err)
+                Self::Error(err)
             }
         }
     }