Fixed same_enum_variation clippy warnings in components/script/dom (s…

…ervo#33818) Signed-off-by: jahielkomu <[email protected]>
Loirooriol · Oct 14, 2024 · 717baff · 717baff
1 parent fc0835b
commit 717baff
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs
@@ -1045,7 +1045,7 @@ impl HTMLImageElement {
         }
         // step 7, await a stable state.
         self.generation.set(self.generation.get() + 1);
-        let task = ImageElementMicrotask::StableStateUpdateImageDataTask {
+        let task = ImageElementMicrotask::StableStateUpdateImageData {
             elem: DomRoot::from_ref(self),
             generation: self.generation.get(),
         };
@@ -1055,7 +1055,7 @@ impl HTMLImageElement {
     /// <https://html.spec.whatwg.org/multipage/#img-environment-changes>
     pub fn react_to_environment_changes(&self) {
         // Step 1
-        let task = ImageElementMicrotask::EnvironmentChangesTask {
+        let task = ImageElementMicrotask::EnvironmentChanges {
             elem: DomRoot::from_ref(self),
             generation: self.generation.get(),
         };
@@ -1400,15 +1400,15 @@ impl HTMLImageElement {
 
 #[derive(JSTraceable, MallocSizeOf)]
 pub enum ImageElementMicrotask {
-    StableStateUpdateImageDataTask {
+    StableStateUpdateImageData {
         elem: DomRoot<HTMLImageElement>,
         generation: u32,
     },
-    EnvironmentChangesTask {
+    EnvironmentChanges {
         elem: DomRoot<HTMLImageElement>,
         generation: u32,
     },
-    DecodeTask {
+    Decode {
         elem: DomRoot<HTMLImageElement>,
         #[ignore_malloc_size_of = "promises are hard"]
         promise: Rc<Promise>,
@@ -1418,7 +1418,7 @@ pub enum ImageElementMicrotask {
 impl MicrotaskRunnable for ImageElementMicrotask {
     fn handler(&self, can_gc: CanGc) {
         match *self {
-            ImageElementMicrotask::StableStateUpdateImageDataTask {
+            ImageElementMicrotask::StableStateUpdateImageData {
                 ref elem,
                 ref generation,
             } => {
@@ -1428,13 +1428,13 @@ impl MicrotaskRunnable for ImageElementMicrotask {
                     elem.update_the_image_data_sync_steps(can_gc);
                 }
             },
-            ImageElementMicrotask::EnvironmentChangesTask {
+            ImageElementMicrotask::EnvironmentChanges {
                 ref elem,
                 ref generation,
             } => {
                 elem.react_to_environment_changes_sync_steps(*generation, can_gc);
             },
-            ImageElementMicrotask::DecodeTask {
+            ImageElementMicrotask::Decode {
                 ref elem,
                 ref promise,
             } => {
@@ -1445,9 +1445,9 @@ impl MicrotaskRunnable for ImageElementMicrotask {
 
     fn enter_realm(&self) -> JSAutoRealm {
         match self {
-            &ImageElementMicrotask::StableStateUpdateImageDataTask { ref elem, .. } |
-            &ImageElementMicrotask::EnvironmentChangesTask { ref elem, .. } |
-            &ImageElementMicrotask::DecodeTask { ref elem, .. } => enter_realm(&**elem),
+            &ImageElementMicrotask::StableStateUpdateImageData { ref elem, .. } |
+            &ImageElementMicrotask::EnvironmentChanges { ref elem, .. } |
+            &ImageElementMicrotask::Decode { ref elem, .. } => enter_realm(&**elem),
         }
     }
 }
@@ -1719,7 +1719,7 @@ impl HTMLImageElementMethods for HTMLImageElement {
         let promise = Promise::new(&self.global());
 
         // Step 2
-        let task = ImageElementMicrotask::DecodeTask {
+        let task = ImageElementMicrotask::Decode {
             elem: DomRoot::from_ref(self),
             promise: promise.clone(),
         };

diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs
@@ -717,7 +717,7 @@ impl HTMLMediaElement {
         // changed, which is why we need to pass the base URL in the task
         // right here.
         let doc = document_from_node(self);
-        let task = MediaElementMicrotask::ResourceSelectionTask {
+        let task = MediaElementMicrotask::ResourceSelection {
             elem: DomRoot::from_ref(self),
             generation_id: self.generation_id.get(),
             base_url: doc.base_url(),
@@ -1863,7 +1863,7 @@ impl HTMLMediaElement {
                 // https://html.spec.whatwg.org/multipage/#dom-media-seek
 
                 // Step 13.
-                let task = MediaElementMicrotask::SeekedTask {
+                let task = MediaElementMicrotask::Seeked {
                     elem: DomRoot::from_ref(self),
                     generation_id: self.generation_id.get(),
                 };
@@ -2510,7 +2510,7 @@ impl VirtualMethods for HTMLMediaElement {
         self.remove_controls();
 
         if context.tree_connected {
-            let task = MediaElementMicrotask::PauseIfNotInDocumentTask {
+            let task = MediaElementMicrotask::PauseIfNotInDocument {
                 elem: DomRoot::from_ref(self),
             };
             ScriptThread::await_stable_state(Microtask::MediaElement(task));
@@ -2537,16 +2537,16 @@ impl LayoutHTMLMediaElementHelpers for LayoutDom<'_, HTMLMediaElement> {
 
 #[derive(JSTraceable, MallocSizeOf)]
 pub enum MediaElementMicrotask {
-    ResourceSelectionTask {
+    ResourceSelection {
         elem: DomRoot<HTMLMediaElement>,
         generation_id: u32,
         #[no_trace]
         base_url: ServoUrl,
     },
-    PauseIfNotInDocumentTask {
+    PauseIfNotInDocument {
         elem: DomRoot<HTMLMediaElement>,
     },
-    SeekedTask {
+    Seeked {
         elem: DomRoot<HTMLMediaElement>,
         generation_id: u32,
     },
@@ -2555,7 +2555,7 @@ pub enum MediaElementMicrotask {
 impl MicrotaskRunnable for MediaElementMicrotask {
     fn handler(&self, can_gc: CanGc) {
         match self {
-            &MediaElementMicrotask::ResourceSelectionTask {
+            &MediaElementMicrotask::ResourceSelection {
                 ref elem,
                 generation_id,
                 ref base_url,
@@ -2564,12 +2564,12 @@ impl MicrotaskRunnable for MediaElementMicrotask {
                     elem.resource_selection_algorithm_sync(base_url.clone(), can_gc);
                 }
             },
-            MediaElementMicrotask::PauseIfNotInDocumentTask { elem } => {
+            MediaElementMicrotask::PauseIfNotInDocument { elem } => {
                 if !elem.upcast::<Node>().is_connected() {
                     elem.internal_pause_steps();
                 }
             },
-            &MediaElementMicrotask::SeekedTask {
+            &MediaElementMicrotask::Seeked {
                 ref elem,
                 generation_id,
             } => {
@@ -2582,9 +2582,9 @@ impl MicrotaskRunnable for MediaElementMicrotask {
 
     fn enter_realm(&self) -> JSAutoRealm {
         match self {
-            &MediaElementMicrotask::ResourceSelectionTask { ref elem, .. } |
-            &MediaElementMicrotask::PauseIfNotInDocumentTask { ref elem } |
-            &MediaElementMicrotask::SeekedTask { ref elem, .. } => enter_realm(&**elem),
+            &MediaElementMicrotask::ResourceSelection { ref elem, .. } |
+            &MediaElementMicrotask::PauseIfNotInDocument { ref elem } |
+            &MediaElementMicrotask::Seeked { ref elem, .. } => enter_realm(&**elem),
         }
     }
 }