auto merge of #2606 : Ms2ger/servo/warnings, r=jdm

src/components/main/layout/context.rs

@@ -70,7 +70,7 @@ pub struct LayoutContext {
 
     /// The CSS selector stylist.
     ///
-    /// FIXME(pcwalton): Make this no longer an unsafe pointer once we have fast `RWArc`s.
+    /// FIXME(#2604): Make this no longer an unsafe pointer once we have fast `RWArc`s.
     pub stylist: *Stylist,
 
     /// The root node at which we're starting the layout.

src/components/main/layout/flow_list.rs

@@ -13,6 +13,7 @@ use std::ptr;
 
 pub type Link = Option<FlowRef>;
 
+#[allow(raw_pointer_deriving)]
 #[deriving(Clone)]
 pub struct Rawlink {
     vtable: *(),

src/components/script/dom/bindings/callback.rs

@@ -44,6 +44,7 @@ pub struct CallbackInterface {
     object: CallbackObject
 }
 
+#[allow(raw_pointer_deriving)]
 #[deriving(Clone,Eq,Encodable)]
 struct CallbackObject {
     callback: Traceable<*mut JSObject>,

src/components/script/dom/bindings/utils.rs

@@ -412,9 +412,10 @@ pub fn reflect_dom_object<T: Reflectable>
     Temporary::new(wrap_fn(window.deref().get_cx(), window, obj))
 }
 
+#[allow(raw_pointer_deriving)]
 #[deriving(Eq)]
 pub struct Reflector {
-    pub object: *mut JSObject,
+    object: *mut JSObject,
 }
 
 impl Reflector {

src/components/script/dom/browsercontext.rs

@@ -15,6 +15,7 @@ use js::rust::with_compartment;
 use libc::c_void;
 use std::ptr;
 
+#[allow(raw_pointer_deriving)]
 #[deriving(Encodable)]
 pub struct BrowserContext {
     history: Vec<SessionHistoryEntry>,

src/components/script/dom/xmlhttprequest.rs

@@ -762,6 +762,6 @@ impl<'a> PrivateXMLHttpRequestHelpers for JSRef<'a, XMLHttpRequest> {
         }
         // According to Simon, decode() should never return an error, so unwrap()ing
         // the result should be fine. XXXManishearth have a closer look at this later
-        encoding.decode(self.response.as_slice(), DecodeReplace).unwrap().to_owned()
+        encoding.decode(self.response.as_slice(), DecodeReplace).unwrap().to_string()
     }
 }

src/support/alert/rust-alert

@@ -1 +1 @@
-Subproject commit 8545e95c2d33d6a9d01ac04b206459d602f9491e
+Subproject commit 6b86f1f01ecb4623942369d25e0dd941adb091de