From 3ef8a48ded99c95d6a35937366e3122d7cdc0879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 7 Mar 2023 10:46:34 +0200 Subject: [PATCH] Fix a few new clippy warnings Part-of: --- net/aws/src/s3sink/imp.rs | 8 ++------ net/aws/src/s3src/imp.rs | 8 ++------ net/reqwest/src/reqwesthttpsrc/imp.rs | 9 ++------- video/ffv1/src/ffv1dec/imp.rs | 8 ++------ 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/net/aws/src/s3sink/imp.rs b/net/aws/src/s3sink/imp.rs index 1871740e..3cbe5681 100644 --- a/net/aws/src/s3sink/imp.rs +++ b/net/aws/src/s3sink/imp.rs @@ -84,18 +84,14 @@ impl Started { } } +#[derive(Default)] enum State { + #[default] Stopped, Completed, Started(Started), } -impl Default for State { - fn default() -> State { - State::Stopped - } -} - struct Settings { region: Region, bucket: Option, diff --git a/net/aws/src/s3src/imp.rs b/net/aws/src/s3src/imp.rs index 81544f0b..002bd612 100644 --- a/net/aws/src/s3src/imp.rs +++ b/net/aws/src/s3src/imp.rs @@ -30,8 +30,10 @@ const DEFAULT_RETRY_ATTEMPTS: u32 = 5; const DEFAULT_REQUEST_TIMEOUT_MSEC: u64 = 15000; const DEFAULT_RETRY_DURATION_MSEC: u64 = 60_000; +#[derive(Default)] #[allow(clippy::large_enum_variant)] enum StreamingState { + #[default] Stopped, Started { url: GstS3Url, @@ -40,12 +42,6 @@ enum StreamingState { }, } -impl Default for StreamingState { - fn default() -> StreamingState { - StreamingState::Stopped - } -} - struct Settings { url: Option, access_key: Option, diff --git a/net/reqwest/src/reqwesthttpsrc/imp.rs b/net/reqwest/src/reqwesthttpsrc/imp.rs index 52dabc32..be9c9605 100644 --- a/net/reqwest/src/reqwesthttpsrc/imp.rs +++ b/net/reqwest/src/reqwesthttpsrc/imp.rs @@ -123,8 +123,9 @@ struct ClientContextInner { } #[allow(clippy::large_enum_variant)] -#[derive(Debug)] +#[derive(Debug, Default)] enum State { + #[default] Stopped, Started { uri: Url, @@ -138,12 +139,6 @@ enum State { }, } -impl Default for State { - fn default() -> Self { - State::Stopped - } -} - #[derive(Debug, Default)] pub struct ReqwestHttpSrc { client: Mutex>, diff --git a/video/ffv1/src/ffv1dec/imp.rs b/video/ffv1/src/ffv1dec/imp.rs index 6eece27c..8911f6e1 100644 --- a/video/ffv1/src/ffv1dec/imp.rs +++ b/video/ffv1/src/ffv1dec/imp.rs @@ -21,7 +21,9 @@ use gst_video::VideoFormat; use once_cell::sync::Lazy; use std::sync::Mutex; +#[derive(Default)] enum DecoderState { + #[default] Stopped, Started { output_info: Option, @@ -30,12 +32,6 @@ enum DecoderState { }, } -impl Default for DecoderState { - fn default() -> Self { - DecoderState::Stopped - } -} - #[derive(Default)] pub struct Ffv1Dec { state: Mutex,