aboutsummaryrefslogtreecommitdiffstats
path: root/src/components/script
diff options
context:
space:
mode:
Diffstat (limited to 'src/components/script')
-rw-r--r--src/components/script/dom/bindings/callback.rs1
-rw-r--r--src/components/script/dom/bindings/utils.rs1
-rw-r--r--src/components/script/dom/browsercontext.rs1
-rw-r--r--src/components/script/dom/xmlhttprequest.rs2
4 files changed, 4 insertions, 1 deletions
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()
}
}