aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2015-01-28 13:54:18 +0530
committerManish Goregaokar <manishsmail@gmail.com>2015-01-28 13:54:18 +0530
commitb8fb725af27c1d7d913618e09c4a246b7039f25e (patch)
tree2be4e1eac7d094b471179d09af1b9cfa647cf241 /components/script/dom
parent547ed204550bf60b0aaa5788eaa0c1590da1544d (diff)
downloadservo-b8fb725af27c1d7d913618e09c4a246b7039f25e.tar.gz
servo-b8fb725af27c1d7d913618e09c4a246b7039f25e.zip
raw_pointer_deriving -> raw_pointer_derive
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/bindings/callback.rs2
-rw-r--r--components/script/dom/bindings/utils.rs4
-rw-r--r--components/script/dom/browsercontext.rs2
-rw-r--r--components/script/dom/node.rs2
4 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/bindings/callback.rs b/components/script/dom/bindings/callback.rs
index 3bfc0c107a4..9ea041b6f8d 100644
--- a/components/script/dom/bindings/callback.rs
+++ b/components/script/dom/bindings/callback.rs
@@ -53,7 +53,7 @@ pub struct CallbackInterface {
/// A common base class for representing IDL callback function and
/// callback interface types.
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
#[derive(Copy, Clone,PartialEq)]
#[jstraceable]
struct CallbackObject {
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index eef06a16a3b..8f43eed9104 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -49,7 +49,7 @@ use js;
/// Proxy handler for a WindowProxy.
pub struct WindowProxyHandler(pub *const libc::c_void);
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
#[jstraceable]
/// Static data associated with a global object.
pub struct GlobalStaticData {
@@ -354,7 +354,7 @@ pub fn reflect_dom_object<T: Reflectable>
/// A struct to store a reference to the reflector of a DOM object.
// Allowing unused_attribute because the lint sometimes doesn't run in order
-#[allow(raw_pointer_deriving, unrooted_must_root, unused_attributes)]
+#[allow(raw_pointer_derive, unrooted_must_root, unused_attributes)]
#[derive(PartialEq)]
#[must_root]
#[servo_lang = "reflector"]
diff --git a/components/script/dom/browsercontext.rs b/components/script/dom/browsercontext.rs
index 2e7be2d05f0..cbe3bcbe63d 100644
--- a/components/script/dom/browsercontext.rs
+++ b/components/script/dom/browsercontext.rs
@@ -26,7 +26,7 @@ use js::{JSRESOLVE_QUALIFIED, JSRESOLVE_ASSIGNING};
use std::ptr;
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
#[jstraceable]
#[privatize]
pub struct BrowserContext {
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs
index 405d950b7f4..40fa4b037b4 100644
--- a/components/script/dom/node.rs
+++ b/components/script/dom/node.rs
@@ -2206,7 +2206,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
/// The address of a node known to be valid. These are sent from script to layout,
/// and are also used in the HTML parser interface.
-#[allow(raw_pointer_deriving)]
+#[allow(raw_pointer_derive)]
#[derive(Clone, PartialEq, Eq, Copy)]
pub struct TrustedNodeAddress(pub *const c_void);