style: Update for new lints

Author: epage

build.rs

@@ -11,6 +11,7 @@ fn main() {
     let out = path::PathBuf::from(env::var_os("OUT_DIR").expect("run within cargo"))
         .join("current_target.txt");
     let default_target = env::var("TARGET").expect("run as cargo build script");
-    let mut file = fs::File::create(out).unwrap();
-    file.write_all(default_target.as_bytes()).unwrap();
+    let mut file = fs::File::create(out).expect("can write to OUT_DIR");
+    file.write_all(default_target.as_bytes())
+        .expect("can write to OUT_DIR");
 }

examples/example_fixture.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::exit)]
+
 use std::env;
 use std::error::Error;
 use std::io;

examples/failure.rs

@@ -1,3 +1,4 @@
+#[allow(clippy::wildcard_imports)] // false positive
 use assert_cmd::prelude::*;
 
 use std::process::Command;

src/assert.rs

@@ -547,7 +547,7 @@ where
 }
 
 /// Keep `predicates` concrete Predicates out of our public API.
-/// [predicates_core::Predicate] used by [`IntoCodePredicate`] for code.
+/// [`predicates_core::Predicate`] used by [`IntoCodePredicate`] for code.
 ///
 /// # Example
 ///
@@ -616,7 +616,7 @@ impl IntoCodePredicate<EqCodePredicate> for i32 {
 }
 
 /// Keep `predicates` concrete Predicates out of our public API.
-/// [predicates_core::Predicate] used by [`IntoCodePredicate`] for iterables of codes.
+/// [`predicates_core::Predicate`] used by [`IntoCodePredicate`] for iterables of codes.
 ///
 /// # Example
 ///
@@ -741,7 +741,7 @@ where
 }
 
 /// Keep `predicates` concrete Predicates out of our public API.
-/// [predicates_core::Predicate] used by [`IntoOutputPredicate`] for bytes.
+/// [`predicates_core::Predicate`] used by [`IntoOutputPredicate`] for bytes.
 ///
 /// # Example
 ///
@@ -781,7 +781,7 @@ impl predicates_core::Predicate<[u8]> for BytesContentOutputPredicate {
         &self,
         expected: bool,
         variable: &[u8],
-    ) -> Option<predicates_core::reflection::Case> {
+    ) -> Option<predicates_core::reflection::Case<'_>> {
         let actual = self.eval(variable);
         if expected == actual {
             Some(predicates_core::reflection::Case::new(Some(self), actual))
@@ -814,7 +814,7 @@ impl IntoOutputPredicate<BytesContentOutputPredicate> for &'static [u8] {
 }
 
 /// Keep `predicates` concrete Predicates out of our public API.
-/// [predicates_core::Predicate] used by [`IntoOutputPredicate`] for [`str`].
+/// [`predicates_core::Predicate`] used by [`IntoOutputPredicate`] for [`str`].
 ///
 /// # Example
 ///
@@ -901,7 +901,7 @@ impl IntoOutputPredicate<StrContentOutputPredicate> for &'static str {
 }
 
 // Keep `predicates` concrete Predicates out of our public API.
-/// [predicates_core::Predicate] used by [`IntoOutputPredicate`] for
+/// [`predicates_core::Predicate`] used by [`IntoOutputPredicate`] for
 /// [`Predicate<str>`][predicates_core::Predicate].
 ///
 /// # Example
@@ -1123,7 +1123,7 @@ mod test {
     fn convert_code<I, P>(pred: I) -> P
     where
         I: IntoCodePredicate<P>,
-        P: predicates_core::Predicate<i32>,
+        P: Predicate<i32>,
     {
         pred.into_code()
     }
@@ -1157,7 +1157,7 @@ mod test {
     fn convert_output<I, P>(pred: I) -> P
     where
         I: IntoOutputPredicate<P>,
-        P: predicates_core::Predicate<[u8]>,
+        P: Predicate<[u8]>,
     {
         pred.into_output()
     }

src/bin/bin_fixture.rs

@@ -1,3 +1,5 @@
+#![allow(clippy::exit)]
+
 use std::env;
 use std::error::Error;
 use std::io;

src/cargo.rs

@@ -213,7 +213,7 @@ fn target_dir() -> path::PathBuf {
             }
             path
         })
-        .unwrap()
+        .expect("this should only be used where a `current_exe` can be set")
 }
 
 /// Look up the path to a cargo-built binary within an integration test.

src/cmd.rs

@@ -444,12 +444,8 @@ impl Command {
         input: Option<Vec<u8>>,
         timeout: Option<std::time::Duration>,
     ) -> io::Result<process::Output> {
-        let stdin = input.and_then(|i| {
-            child
-                .stdin
-                .take()
-                .map(|mut stdin| std::thread::spawn(move || stdin.write_all(&i)))
-        });
+        #![allow(clippy::unwrap_used)] // changes behavior in some tests
+
         fn read<R>(mut input: R) -> std::thread::JoinHandle<io::Result<Vec<u8>>>
         where
             R: Read + Send + 'static,
@@ -459,6 +455,13 @@ impl Command {
                 input.read_to_end(&mut ret).map(|_| ret)
             })
         }
+
+        let stdin = input.and_then(|i| {
+            child
+                .stdin
+                .take()
+                .map(|mut stdin| std::thread::spawn(move || stdin.write_all(&i)))
+        });
         let stdout = child.stdout.take().map(read);
         let stderr = child.stderr.take().map(read);
 

src/output.rs

@@ -350,12 +350,13 @@ fn format_bytes(data: &[u8], f: &mut impl fmt::Write) -> fmt::Result {
     const LINES_MAX_START: usize = 20;
     const LINES_MAX_END: usize = 40;
     const LINES_MAX_PRINTED: usize = LINES_MAX_START + LINES_MAX_END;
-    assert!(LINES_MAX_PRINTED < LINES_MIN_OVERFLOW);
 
     const BYTES_MIN_OVERFLOW: usize = 8192;
     const BYTES_MAX_START: usize = 2048;
     const BYTES_MAX_END: usize = 2048;
     const BYTES_MAX_PRINTED: usize = BYTES_MAX_START + BYTES_MAX_END;
+
+    assert!(LINES_MAX_PRINTED < LINES_MIN_OVERFLOW);
     assert!(BYTES_MAX_PRINTED < BYTES_MIN_OVERFLOW);
 
     let lines_total = data.as_bstr().lines_with_terminator().count();