From 4ceabe9400bc4337a7093c08ceb3b375530e38cf Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Tue, 12 Nov 2024 09:56:07 -0300 Subject: [PATCH] validate: Remove ActionError::None type It was useless. Part-of: --- gstreamer-validate/src/action_type.rs | 1 - gstreamer-validate/src/enums.rs | 5 ----- 2 files changed, 6 deletions(-) diff --git a/gstreamer-validate/src/action_type.rs b/gstreamer-validate/src/action_type.rs index de73ccb5e..ee64ce66b 100644 --- a/gstreamer-validate/src/action_type.rs +++ b/gstreamer-validate/src/action_type.rs @@ -340,7 +340,6 @@ impl<'a> ActionTypeBuilder<'a> { action.report_error(err); ffi::GST_VALIDATE_EXECUTE_ACTION_ERROR_REPORTED } - Err(_) => panic!("New action error types should be handled here."), Ok(v) => v.into_glib(), } } diff --git a/gstreamer-validate/src/enums.rs b/gstreamer-validate/src/enums.rs index 0a5d11ff7..7e0fdc3f9 100644 --- a/gstreamer-validate/src/enums.rs +++ b/gstreamer-validate/src/enums.rs @@ -39,7 +39,6 @@ impl IntoGlib for ActionSuccess { #[repr(i32)] pub enum ActionError { Error(String), - None = ffi::GST_VALIDATE_EXECUTE_ACTION_NONE, } impl ActionError { @@ -49,7 +48,6 @@ impl ActionError { ffi::GST_VALIDATE_EXECUTE_ACTION_ERROR => { ActionError::Error("Execution failed".to_string()) } - ffi::GST_VALIDATE_EXECUTE_ACTION_NONE => ActionError::None, _ => ActionError::Error("Unknown error".to_string()), } } @@ -62,7 +60,6 @@ impl IntoGlib for ActionError { fn into_glib(self) -> ffi::GstValidateActionReturn { match self { ActionError::Error(_) => ffi::GST_VALIDATE_EXECUTE_ACTION_ERROR, - ActionError::None => ffi::GST_VALIDATE_EXECUTE_ACTION_NONE, } } } @@ -135,7 +132,6 @@ impl ActionReturn { Self::Error | Self::ErrorReported => { Err(ActionError::Error("Execution failed".to_string())) } - Self::None => Err(ActionError::None), _ => Ok(unsafe { std::mem::transmute::(self) }), } } @@ -146,7 +142,6 @@ impl ActionReturn { match v { ActionError::Error(_) => Self::Error, - ActionError::None => Self::None, } }