From 0071b45449d64320c759af5931b85c4668531342 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Fri, 20 May 2016 13:11:36 +0200
Subject: [PATCH] Remove the pointless StorageThread alias.

---
 components/net/storage_thread.rs        | 8 ++++----
 components/net_traits/lib.rs            | 6 +++---
 components/net_traits/storage_thread.rs | 5 -----
 components/script/dom/storage.rs        | 6 +++---
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/components/net/storage_thread.rs b/components/net/storage_thread.rs
index 49c65c96e19..bd48993e450 100644
--- a/components/net/storage_thread.rs
+++ b/components/net/storage_thread.rs
@@ -3,7 +3,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use ipc_channel::ipc::{self, IpcReceiver, IpcSender};
-use net_traits::storage_thread::{StorageThread, StorageThreadMsg, StorageType};
+use net_traits::storage_thread::{StorageThreadMsg, StorageType};
 use resource_thread;
 use std::borrow::ToOwned;
 use std::collections::BTreeMap;
@@ -18,9 +18,9 @@ pub trait StorageThreadFactory {
     fn new() -> Self;
 }
 
-impl StorageThreadFactory for StorageThread {
-    /// Create a StorageThread
-    fn new() -> StorageThread {
+impl StorageThreadFactory for IpcSender<StorageThreadMsg> {
+    /// Create a storage thread
+    fn new() -> IpcSender<StorageThreadMsg> {
         let (chan, port) = ipc::channel().unwrap();
         spawn_named("StorageManager".to_owned(), move || {
             StorageManager::new(port).start();
diff --git a/components/net_traits/lib.rs b/components/net_traits/lib.rs
index 94b43b65694..c940f3b0f68 100644
--- a/components/net_traits/lib.rs
+++ b/components/net_traits/lib.rs
@@ -38,7 +38,7 @@ use msg::constellation_msg::{PipelineId, ReferrerPolicy};
 use std::io::Error as IOError;
 use std::sync::mpsc::Sender;
 use std::thread;
-use storage_thread::{StorageThread, StorageThreadMsg};
+use storage_thread::StorageThreadMsg;
 use url::Url;
 use websocket::header;
 
@@ -199,11 +199,11 @@ pub trait IpcSend<T> where T: serde::Serialize + serde::Deserialize {
 #[derive(Clone, Serialize, Deserialize)]
 pub struct ResourceThreads {
     core_thread: CoreResourceThread,
-    storage_thread: StorageThread,
+    storage_thread: IpcSender<StorageThreadMsg>,
 }
 
 impl ResourceThreads {
-    pub fn new(c: CoreResourceThread, s: StorageThread) -> ResourceThreads {
+    pub fn new(c: CoreResourceThread, s: IpcSender<StorageThreadMsg>) -> ResourceThreads {
         ResourceThreads {
             core_thread: c,
             storage_thread: s,
diff --git a/components/net_traits/storage_thread.rs b/components/net_traits/storage_thread.rs
index f544c50a059..1f343ee201d 100644
--- a/components/net_traits/storage_thread.rs
+++ b/components/net_traits/storage_thread.rs
@@ -38,8 +38,3 @@ pub enum StorageThreadMsg {
     /// shut down this thread
     Exit
 }
-
-/// Handle to a storage thread
-pub type StorageThread = IpcSender<StorageThreadMsg>;
-
-
diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs
index c3004a1031a..a71881fccd6 100644
--- a/components/script/dom/storage.rs
+++ b/components/script/dom/storage.rs
@@ -14,9 +14,9 @@ use dom::browsingcontext::IterableContext;
 use dom::event::{Event, EventBubbles, EventCancelable};
 use dom::storageevent::StorageEvent;
 use dom::urlhelper::UrlHelper;
-use ipc_channel::ipc;
+use ipc_channel::ipc::{self, IpcSender};
 use net_traits::IpcSend;
-use net_traits::storage_thread::{StorageThread, StorageThreadMsg, StorageType};
+use net_traits::storage_thread::{StorageThreadMsg, StorageType};
 use script_thread::{MainThreadRunnable, ScriptThread};
 use task_source::dom_manipulation::DOMManipulationTask;
 use url::Url;
@@ -46,7 +46,7 @@ impl Storage {
         global_ref.get_url()
     }
 
-    fn get_storage_thread(&self) -> StorageThread {
+    fn get_storage_thread(&self) -> IpcSender<StorageThreadMsg> {
         let global_root = self.global();
         let global_ref = global_root.r();
         global_ref.as_window().resource_threads().sender()