aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/utils.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-01-28 02:27:50 -0700
committerbors-servo <metajack+bors@gmail.com>2015-01-28 02:27:50 -0700
commitd373f8dc26239310dec8d2fd66ed72385548cf6f (patch)
tree09b45bc1bee59999e61359ef9647f87fa0626579 /components/script/dom/bindings/utils.rs
parent1a2a08aa501dd0da8bcdf362b55acb31093f5c9c (diff)
parentb8fb725af27c1d7d913618e09c4a246b7039f25e (diff)
downloadservo-d373f8dc26239310dec8d2fd66ed72385548cf6f.tar.gz
servo-d373f8dc26239310dec8d2fd66ed72385548cf6f.zip
auto merge of #4739 : Manishearth/servo/warning-patrol, r=Ms2ger
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
-rw-r--r--components/script/dom/bindings/utils.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 47543b1f61f..2819018cf27 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -47,7 +47,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 {
@@ -352,7 +352,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"]