Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Make Actor::handle_message take &str instead of &String

Browse source 
Fixes #5305
This commit is contained in:
Corey Farwell 2015-03-21 20:56:14 -04:00
parent 87af57cefc
commit 2764ec0f7b
5 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/devtools/actor.rs
View file

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

4
components/devtools/actors/console.rs
View file

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

20
components/devtools/actors/inspector.rs
View file

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

4
components/devtools/actors/root.rs
View file

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

4
components/devtools/actors/tab.rs
View file

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