Fix clippy warnings

Finomnis · Jan 7, 2023 · d7a6183 · d7a6183
1 parent 62cd316
commit d7a6183
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/examples/hyper.rs b/examples/hyper.rs
@@ -42,7 +42,7 @@ async fn hyper_subsystem(subsys: SubsystemHandle) -> Result<()> {
     server
         .with_graceful_shutdown(subsys.on_shutdown_requested())
         .await
-        .or_else(|err| Err(miette! {err}))
+        .map_err(|err| miette! {err})
 }
 
 #[tokio::main]

diff --git a/src/errors.rs b/src/errors.rs
@@ -171,7 +171,7 @@ mod tests {
         };
 
         let matches_related = |data: &Vec<SubsystemError<BoxedError>>| {
-            let mut iter = data.into_iter();
+            let mut iter = data.iter();
 
             let elem = iter.next().unwrap();
             assert_eq!(elem.name(), "a");

diff --git a/tests/common/event.rs b/tests/common/event.rs
@@ -5,7 +5,7 @@ pub struct Event {
 }
 
 impl Event {
-    pub fn create() -> (Self, impl FnOnce() -> ()) {
+    pub fn create() -> (Self, impl FnOnce()) {
         let (sender, receiver) = watch::channel(false);
         (Self { receiver }, move || {
             sender.send_replace(true);

diff --git a/tests/integration_test.rs b/tests/integration_test.rs
@@ -944,12 +944,12 @@ async fn subsystem_errors_get_propagated_to_user() {
             assert_eq!("subsys/nested2", name);
             assert_eq!("MyGreatError", format!("{}", e));
         } else {
-            assert!(false, "Incorrect error type!");
+            panic!("Incorrect error type!");
         }
         assert!(matches!(el, SubsystemError::Failed(_, _)));
         assert_eq!("subsys/nested2", el.name());
     } else {
-        assert!(false, "Incorrect return value!");
+        panic!("Incorrect return value!");
     }
 }
 
@@ -1003,7 +1003,7 @@ async fn subsystem_errors_get_propagated_to_user_when_timeout() {
             assert_eq!("subsys/nested2", name);
             assert_eq!("MyGreatError", format!("{}", e));
         } else {
-            assert!(false, "Incorrect error type!");
+            panic!("Incorrect error type!");
         }
         assert!(matches!(el, SubsystemError::Failed(_, _)));
         assert_eq!("subsys/nested2", el.name());
@@ -1012,7 +1012,7 @@ async fn subsystem_errors_get_propagated_to_user_when_timeout() {
         assert!(matches!(el, SubsystemError::Cancelled(_)));
         assert_eq!("subsys/nested3", el.name());
     } else {
-        assert!(false, "Incorrect return value!");
+        panic!("Incorrect return value!");
     }
 }