servo: Merge #5311 - Make Actor::handle_message take &str instead of &String (from frewsxcv:handle-message-str); r=jdm

Fixes #5305

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

servo/components/devtools/actor.rs

@@ -18,7 +18,7 @@ use rustc_serialize::json;
 pub trait Actor: Any {
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()>;
     fn name(&self) -> String;

servo/components/devtools/actors/console.rs

@@ -118,10 +118,10 @@ impl Actor for ConsoleActor {
 
     fn handle_message(&self,
                       _registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "getCachedMessages" => {
                 let types = msg.get(&"messageTypes".to_string()).unwrap().as_array().unwrap();
                 let /*mut*/ messages = vec!();

servo/components/devtools/actors/inspector.rs

@@ -66,10 +66,10 @@ impl Actor for HighlighterActor {
 
     fn handle_message(&self,
                       _registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       _msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "showBoxModel" => {
                 let msg = ShowBoxModelReply {
                     from: self.name(),
@@ -103,10 +103,10 @@ impl Actor for NodeActor {
 
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "modifyAttributes" => {
                 let target = msg.get(&"to".to_string()).unwrap().as_string().unwrap();
                 let mods = msg.get(&"modifications".to_string()).unwrap().as_array().unwrap();
@@ -277,10 +277,10 @@ impl Actor for WalkerActor {
 
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "querySelector" => {
                 let msg = QuerySelectorReply {
                     from: self.name(),
@@ -423,10 +423,10 @@ impl Actor for PageStyleActor {
 
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "getApplied" => {
                 //TODO: query script for relevant applied styles to node (msg.node)
                 let msg = GetAppliedReply {
@@ -495,10 +495,10 @@ impl Actor for InspectorActor {
 
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       _msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "getWalker" => {
                 if self.walker.borrow().is_none() {
                     let walker = WalkerActor {

servo/components/devtools/actors/root.rs

@@ -52,10 +52,10 @@ impl Actor for RootActor {
 
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       _msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "listAddons" => {
                 let actor = ErrorReply {
                     from: "root".to_string(),

servo/components/devtools/actors/tab.rs

@@ -77,10 +77,10 @@ impl Actor for TabActor {
 
     fn handle_message(&self,
                       registry: &ActorRegistry,
-                      msg_type: &String,
+                      msg_type: &str,
                       _msg: &json::Object,
                       stream: &mut TcpStream) -> Result<bool, ()> {
-        Ok(match &**msg_type {
+        Ok(match msg_type {
             "reconfigure" => {
                 stream.write_json_packet(&ReconfigureReply { from: self.name() });
                 true