diff options
Diffstat (limited to 'components/shared/embedder/lib.rs')
-rw-r--r-- | components/shared/embedder/lib.rs | 49 |
1 files changed, 5 insertions, 44 deletions
diff --git a/components/shared/embedder/lib.rs b/components/shared/embedder/lib.rs index a40942500e7..c1c45c52417 100644 --- a/components/shared/embedder/lib.rs +++ b/components/shared/embedder/lib.rs @@ -19,6 +19,7 @@ use malloc_size_of_derive::MallocSizeOf; use num_derive::FromPrimitive; use serde::{Deserialize, Serialize}; use servo_url::ServoUrl; +use strum_macros::IntoStaticStr; use url::Url; use webrender_api::units::{DeviceIntPoint, DeviceIntRect, DeviceIntSize}; @@ -213,7 +214,7 @@ pub enum AllowOrDeny { Deny, } -#[derive(Deserialize, Serialize)] +#[derive(Deserialize, IntoStaticStr, Serialize)] pub enum EmbedderMsg { /// A status message to be displayed by the browser chrome. Status(WebViewId, Option<String>), @@ -322,49 +323,9 @@ pub enum EmbedderMsg { } impl Debug for EmbedderMsg { - fn fmt(&self, f: &mut Formatter) -> Result<(), Error> { - match *self { - EmbedderMsg::Status(..) => write!(f, "Status"), - EmbedderMsg::ChangePageTitle(..) => write!(f, "ChangePageTitle"), - EmbedderMsg::MoveTo(..) => write!(f, "MoveTo"), - EmbedderMsg::ResizeTo(..) => write!(f, "ResizeTo"), - EmbedderMsg::ShowSimpleDialog(..) => write!(f, "ShowSimpleDialog"), - EmbedderMsg::RequestAuthentication(..) => write!(f, "RequestAuthentication"), - EmbedderMsg::AllowUnload(..) => write!(f, "AllowUnload"), - EmbedderMsg::AllowNavigationRequest(..) => write!(f, "AllowNavigationRequest"), - EmbedderMsg::Keyboard(..) => write!(f, "Keyboard"), - EmbedderMsg::ClearClipboard(..) => write!(f, "ClearClipboard"), - EmbedderMsg::GetClipboardText(..) => write!(f, "GetClipboardText"), - EmbedderMsg::SetClipboardText(..) => write!(f, "SetClipboardText"), - EmbedderMsg::SetCursor(..) => write!(f, "SetCursor"), - EmbedderMsg::NewFavicon(..) => write!(f, "NewFavicon"), - EmbedderMsg::HistoryChanged(..) => write!(f, "HistoryChanged"), - EmbedderMsg::NotifyFullscreenStateChanged(..) => { - write!(f, "NotifyFullscreenStateChanged") - }, - EmbedderMsg::NotifyLoadStatusChanged(_, status) => { - write!(f, "NotifyLoadStatusChanged({status:?})") - }, - EmbedderMsg::WebResourceRequested(..) => write!(f, "WebResourceRequested"), - EmbedderMsg::Panic(..) => write!(f, "Panic"), - EmbedderMsg::GetSelectedBluetoothDevice(..) => write!(f, "GetSelectedBluetoothDevice"), - EmbedderMsg::SelectFiles(..) => write!(f, "SelectFiles"), - EmbedderMsg::PromptPermission(..) => write!(f, "PromptPermission"), - EmbedderMsg::ShowIME(..) => write!(f, "ShowIME"), - EmbedderMsg::HideIME(..) => write!(f, "HideIME"), - EmbedderMsg::AllowOpeningWebView(..) => write!(f, "AllowOpeningWebView"), - EmbedderMsg::WebViewClosed(..) => write!(f, "WebViewClosed"), - EmbedderMsg::WebViewFocused(..) => write!(f, "WebViewFocused"), - EmbedderMsg::WebViewBlurred => write!(f, "WebViewBlurred"), - EmbedderMsg::ReportProfile(..) => write!(f, "ReportProfile"), - EmbedderMsg::MediaSessionEvent(..) => write!(f, "MediaSessionEvent"), - EmbedderMsg::OnDevtoolsStarted(..) => write!(f, "OnDevtoolsStarted"), - EmbedderMsg::RequestDevtoolsConnection(..) => write!(f, "RequestDevtoolsConnection"), - EmbedderMsg::ShowContextMenu(..) => write!(f, "ShowContextMenu"), - EmbedderMsg::PlayGamepadHapticEffect(..) => write!(f, "PlayGamepadHapticEffect"), - EmbedderMsg::StopGamepadHapticEffect(..) => write!(f, "StopGamepadHapticEffect"), - EmbedderMsg::ShutdownComplete => write!(f, "ShutdownComplete"), - } + fn fmt(&self, formatter: &mut Formatter) -> Result<(), Error> { + let string: &'static str = self.into(); + write!(formatter, "{string}") } } |