Fix and disable some compile warnings.

6 files changed, 5 insertions, 1 deletions

diff --git a/src/components/main/layout/flow_list.rs b/src/components/main/layout/flow_list.rs
index 93e2fe475a1..a68193a32aa 100644
--- a/src/components/main/layout/flow_list.rs
+++ b/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: *(),
diff --git a/src/components/script/dom/bindings/callback.rs b/src/components/script/dom/bindings/callback.rs
index deebc53d6e3..97df62193d8 100644
--- a/src/components/script/dom/bindings/callback.rs
+++ b/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>,
diff --git a/src/components/script/dom/bindings/utils.rs b/src/components/script/dom/bindings/utils.rs
index 2da31f8bf2f..c7a30b634ce 100644
--- a/src/components/script/dom/bindings/utils.rs
+++ b/src/components/script/dom/bindings/utils.rs
@@ -412,6 +412,7 @@ 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,
diff --git a/src/components/script/dom/browsercontext.rs b/src/components/script/dom/browsercontext.rs
index e107896b030..5c6a3ed0a2e 100644
--- a/src/components/script/dom/browsercontext.rs
+++ b/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>,
diff --git a/src/components/script/dom/xmlhttprequest.rs b/src/components/script/dom/xmlhttprequest.rs
index c3f2c95ea09..50ad87aa1c3 100644
--- a/src/components/script/dom/xmlhttprequest.rs
+++ b/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()
     }
 }
diff --git a/src/support/alert/rust-alert b/src/support/alert/rust-alert
-Subproject 8545e95c2d33d6a9d01ac04b206459d602f9491
+Subproject 6b86f1f01ecb4623942369d25e0dd941adb091d