auto merge of #4585 : Ms2ger/servo/NavigatorInfo, r=jdm

It serves no purpose.

3 files changed, 33 insertions, 37 deletions

diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs
index 3eb688de6e1..7ecee34f456 100644
--- a/components/script/dom/navigator.rs
+++ b/components/script/dom/navigator.rs
@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::NavigatorBinding::NavigatorMethods;
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use dom::navigatorinfo::NavigatorInfo;
+use dom::navigatorinfo;
 use dom::window::Window;
 use servo_util::str::DOMString;
 
@@ -32,27 +32,27 @@ impl Navigator {
 
 impl<'a> NavigatorMethods for JSRef<'a, Navigator> {
     fn Product(self) -> DOMString {
-        NavigatorInfo::Product()
+        navigatorinfo::Product()
     }
 
     fn TaintEnabled(self) -> bool {
-        NavigatorInfo::TaintEnabled()
+        navigatorinfo::TaintEnabled()
     }
 
     fn AppName(self) -> DOMString {
-        NavigatorInfo::AppName()
+        navigatorinfo::AppName()
     }
 
     fn AppCodeName(self) -> DOMString {
-        NavigatorInfo::AppCodeName()
+        navigatorinfo::AppCodeName()
     }
 
     fn Platform(self) -> DOMString {
-        NavigatorInfo::Platform()
+        navigatorinfo::Platform()
     }
 
     fn UserAgent(self) -> DOMString {
-        NavigatorInfo::UserAgent()
+        navigatorinfo::UserAgent()
     }
 }
 
diff --git a/components/script/dom/navigatorinfo.rs b/components/script/dom/navigatorinfo.rs
index a31983a8276..0dff42d88ea 100644
--- a/components/script/dom/navigatorinfo.rs
+++ b/components/script/dom/navigatorinfo.rs
@@ -5,33 +5,29 @@
 use servo_util::str::DOMString;
 use servo_util::opts;
 
-pub struct NavigatorInfo;
-
-impl NavigatorInfo {
-    pub fn Product() -> DOMString {
-        "Gecko".into_string()
-    }
+pub fn Product() -> DOMString {
+    "Gecko".into_string()
+}
 
-    pub fn TaintEnabled() -> bool {
-        false
-    }
+pub fn TaintEnabled() -> bool {
+    false
+}
 
-    pub fn AppName() -> DOMString {
-        "Netscape".into_string() // Like Gecko/Webkit
-    }
+pub fn AppName() -> DOMString {
+    "Netscape".into_string() // Like Gecko/Webkit
+}
 
-    pub fn AppCodeName() -> DOMString {
-        "Mozilla".into_string()
-    }
+pub fn AppCodeName() -> DOMString {
+    "Mozilla".into_string()
+}
 
-    pub fn Platform() -> DOMString {
-        "".into_string()
-    }
+pub fn Platform() -> DOMString {
+    "".into_string()
+}
 
-    pub fn UserAgent() -> DOMString {
-        match opts::get().user_agent {
-            Some(ref user_agent) => user_agent.clone(),
-            None => "".into_string(),
-        }
+pub fn UserAgent() -> DOMString {
+    match opts::get().user_agent {
+        Some(ref user_agent) => user_agent.clone(),
+        None => "".into_string(),
     }
 }
diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs
index f585153550b..81455a1dd63 100644
--- a/components/script/dom/workernavigator.rs
+++ b/components/script/dom/workernavigator.rs
@@ -7,7 +7,7 @@ use dom::bindings::codegen::Bindings::WorkerNavigatorBinding::WorkerNavigatorMet
 use dom::bindings::global::GlobalRef;
 use dom::bindings::js::{JSRef, Temporary};
 use dom::bindings::utils::{Reflector, reflect_dom_object};
-use dom::navigatorinfo::NavigatorInfo;
+use dom::navigatorinfo;
 use dom::workerglobalscope::WorkerGlobalScope;
 use servo_util::str::DOMString;
 
@@ -32,27 +32,27 @@ impl WorkerNavigator {
 
 impl<'a> WorkerNavigatorMethods for JSRef<'a, WorkerNavigator> {
     fn Product(self) -> DOMString {
-        NavigatorInfo::Product()
+        navigatorinfo::Product()
     }
 
     fn TaintEnabled(self) -> bool {
-        NavigatorInfo::TaintEnabled()
+        navigatorinfo::TaintEnabled()
     }
 
     fn AppName(self) -> DOMString {
-        NavigatorInfo::AppName()
+        navigatorinfo::AppName()
     }
 
     fn AppCodeName(self) -> DOMString {
-        NavigatorInfo::AppCodeName()
+        navigatorinfo::AppCodeName()
     }
 
     fn Platform(self) -> DOMString {
-        NavigatorInfo::Platform()
+        navigatorinfo::Platform()
     }
 
     fn UserAgent(self) -> DOMString {
-        NavigatorInfo::UserAgent()
+        navigatorinfo::UserAgent()
     }
 }