1 files changed, 9 insertions, 9 deletions

diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs
index 07faf3da3c9..4f9c9b4776b 100644
--- a/components/script/dom/serviceworkerglobalscope.rs
+++ b/components/script/dom/serviceworkerglobalscope.rs
@@ -123,9 +123,9 @@ pub enum ServiceWorkerControlMsg {
 }
 
 pub enum MixedMessage {
-    FromServiceWorker(ServiceWorkerScriptMsg),
-    FromDevtools(DevtoolScriptControlMsg),
-    FromControl(ServiceWorkerControlMsg),
+    ServiceWorker(ServiceWorkerScriptMsg),
+    Devtools(DevtoolScriptControlMsg),
+    Control(ServiceWorkerControlMsg),
 }
 
 #[derive(Clone, JSTraceable)]
@@ -202,15 +202,15 @@ impl WorkerEventLoopMethods for ServiceWorkerGlobalScope {
     }
 
     fn from_control_msg(&self, msg: ServiceWorkerControlMsg) -> MixedMessage {
-        MixedMessage::FromControl(msg)
+        MixedMessage::Control(msg)
     }
 
     fn from_worker_msg(&self, msg: ServiceWorkerScriptMsg) -> MixedMessage {
-        MixedMessage::FromServiceWorker(msg)
+        MixedMessage::ServiceWorker(msg)
     }
 
     fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
-        MixedMessage::FromDevtools(msg)
+        MixedMessage::Devtools(msg)
     }
 
     fn control_receiver(&self) -> &Receiver<ServiceWorkerControlMsg> {
@@ -414,7 +414,7 @@ impl ServiceWorkerGlobalScope {
 
     fn handle_mixed_message(&self, msg: MixedMessage) -> bool {
         match msg {
-            MixedMessage::FromDevtools(msg) => match msg {
+            MixedMessage::Devtools(msg) => match msg {
                 DevtoolScriptControlMsg::EvaluateJS(_pipe_id, string, sender) => {
                     devtools::handle_evaluate_js(self.upcast(), string, sender)
                 },
@@ -423,10 +423,10 @@ impl ServiceWorkerGlobalScope {
                 },
                 _ => debug!("got an unusable devtools control message inside the worker!"),
             },
-            MixedMessage::FromServiceWorker(msg) => {
+            MixedMessage::ServiceWorker(msg) => {
                 self.handle_script_event(msg);
             },
-            MixedMessage::FromControl(ServiceWorkerControlMsg::Exit) => {
+            MixedMessage::Control(ServiceWorkerControlMsg::Exit) => {
                 return false;
             },
         }