From d2e6985ef755f064a877295f8226ce64939c71af Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Tue, 23 Sep 2014 11:45:08 -0700 Subject: [PATCH 1/2] Disable non_snake_case warnings in devtools --- components/devtools/lib.rs | 2 ++ components/devtools_traits/lib.rs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index d7305ebdc90..064ecd18ff2 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -8,6 +8,8 @@ #![comment = "The Servo Parallel Browser Project"] #![license = "MPL"] +#![allow(non_snake_case)] + #![feature(phase)] #![feature(phase)] diff --git a/components/devtools_traits/lib.rs b/components/devtools_traits/lib.rs index 1b69499f8a5..8a6406c0e61 100644 --- a/components/devtools_traits/lib.rs +++ b/components/devtools_traits/lib.rs @@ -8,6 +8,8 @@ #![comment = "The Servo Parallel Browser Project"] #![license = "MPL"] +#![allow(non_snake_case)] + extern crate "msg" as servo_msg; /// This module contains shared types and messages for use by devtools/script. From b70845304992a3a4202758221fa5afdac541eaf3 Mon Sep 17 00:00:00 2001 From: Matt Brubeck Date: Tue, 23 Sep 2014 11:47:17 -0700 Subject: [PATCH 2/2] Fix other warnings in devtools --- components/devtools/actor.rs | 4 ++-- components/devtools/actors/inspector.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs index d9f214c79f1..8a2d0be8c12 100644 --- a/components/devtools/actor.rs +++ b/components/devtools/actor.rs @@ -136,7 +136,7 @@ impl ActorRegistry { // fails for unknown reasons. /*let actor: &Actor+Send+Sized = *self.actors.find(&name.to_string()).unwrap(); (actor as &Any).downcast_ref::().unwrap()*/ - self.actors.find(&name.to_string()).unwrap().as_ref::().unwrap() + self.actors.find(&name.to_string()).unwrap().downcast_ref::().unwrap() } /// Find an actor by registered name @@ -162,7 +162,7 @@ impl ActorRegistry { } } } - let mut new_actors = replace(&mut *self.new_actors.borrow_mut(), vec!()); + let new_actors = replace(&mut *self.new_actors.borrow_mut(), vec!()); for actor in new_actors.into_iter() { self.actors.insert(actor.name().to_string(), actor); } diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs index 5d401e4ea7a..67e480c61de 100644 --- a/components/devtools/actors/inspector.rs +++ b/components/devtools/actors/inspector.rs @@ -157,7 +157,7 @@ impl NodeInfoToProtocol for NodeInfo { publicId: self.publicId, systemId: self.systemId, - attrs: self.attrs.move_iter().map(|attr| { + attrs: self.attrs.into_iter().map(|attr| { AttrMsg { namespace: attr.namespace, name: attr.name, @@ -262,7 +262,7 @@ impl Actor for WalkerActor { let msg = ChildrenReply { hasFirst: true, hasLast: true, - nodes: children.move_iter().map(|child| { + nodes: children.into_iter().map(|child| { child.encode(registry, true) }).collect(), from: self.name(),