servo: Merge #8685 - tidy rule to warn against use of &String and refactoring (from jmr0:master); r=Ms2ger

Fixes #8681

Source-Repo: https://github.com/servo/servo
Source-Revision: f96e8ce9e8c0a2c9de9574f538718defdcd93c11

UltraBlame original commit: 42588318b88074b94756d3ac820c5ff09023f3e3

Author: marco-c

servo/components/net/mime_classifier.rs

@@ -129,8 +129,8 @@ impl MIMEClassifier {
         }
     }
 
-    fn get_media_type(media_type: &String,
-                          media_subtype: &String) -> Option<MediaType> {
+    fn get_media_type(media_type: &str,
+                          media_subtype: &str) -> Option<MediaType> {
         if MIMEClassifier::is_xml(media_type, media_subtype) {
             Some(MediaType::Xml)
         } else if MIMEClassifier::is_html(media_type, media_subtype) {

servo/components/profile/mem.rs

@@ -225,7 +225,7 @@ impl ReportsTree {
 
 
 
-    fn find_child(&self, path_seg: &String) -> Option<usize> {
+    fn find_child(&self, path_seg: &str) -> Option<usize> {
         for (i, child) in self.children.iter().enumerate() {
             if child.path_seg == *path_seg {
                 return Some(i);

servo/components/webdriver_server/lib.rs

@@ -525,11 +525,11 @@ impl Handler {
         }
     }
 
-    fn handle_element_attribute(&self, element: &WebElement, name: &String) -> WebDriverResult<WebDriverResponse> {
+    fn handle_element_attribute(&self, element: &WebElement, name: &str) -> WebDriverResult<WebDriverResponse> {
         let pipeline_id = try!(self.frame_pipeline());
 
         let (sender, receiver) = ipc::channel().unwrap();
-        let cmd = WebDriverScriptCommand::GetElementAttribute(element.id.clone(), name.clone(), sender);
+        let cmd = WebDriverScriptCommand::GetElementAttribute(element.id.clone(), name.to_owned(), sender);
         let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
         self.constellation_chan.send(ConstellationMsg::WebDriverCommand(cmd_msg)).unwrap();
         match receiver.recv().unwrap() {
@@ -539,11 +539,11 @@ impl Handler {
         }
     }
 
-    fn handle_element_css(&self, element: &WebElement, name: &String) -> WebDriverResult<WebDriverResponse> {
+    fn handle_element_css(&self, element: &WebElement, name: &str) -> WebDriverResult<WebDriverResponse> {
         let pipeline_id = try!(self.frame_pipeline());
 
         let (sender, receiver) = ipc::channel().unwrap();
-        let cmd = WebDriverScriptCommand::GetElementCSS(element.id.clone(), name.clone(), sender);
+        let cmd = WebDriverScriptCommand::GetElementCSS(element.id.clone(), name.to_owned(), sender);
         let cmd_msg = WebDriverCommandMsg::ScriptCommand(pipeline_id, cmd);
         self.constellation_chan.send(ConstellationMsg::WebDriverCommand(cmd_msg)).unwrap();
         match receiver.recv().unwrap() {

servo/python/tidy.py

@@ -369,6 +369,10 @@ def check_rust(file_name, contents):
         if ": &Vec<" in line:
             yield (idx + 1, "use &[T] instead of &Vec<T>")
 
+        
+        if ": &String" in line:
+            yield (idx + 1, "use &str instead of &String")
+
 
 
 def is_associated_type(match, line, index):