diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-28 02:27:50 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-28 02:27:50 -0700 |
commit | d373f8dc26239310dec8d2fd66ed72385548cf6f (patch) | |
tree | 09b45bc1bee59999e61359ef9647f87fa0626579 /components/script/dom/node.rs | |
parent | 1a2a08aa501dd0da8bcdf362b55acb31093f5c9c (diff) | |
parent | b8fb725af27c1d7d913618e09c4a246b7039f25e (diff) | |
download | servo-d373f8dc26239310dec8d2fd66ed72385548cf6f.tar.gz servo-d373f8dc26239310dec8d2fd66ed72385548cf6f.zip |
auto merge of #4739 : Manishearth/servo/warning-patrol, r=Ms2ger
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 2128b0f93f4..40fa4b037b4 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -60,7 +60,7 @@ use std::cell::{Cell, RefCell, Ref, RefMut}; use std::default::Default; use std::iter::{FilterMap, Peekable}; use std::mem; -use style::{mod, ComputedValues}; +use style::{self, ComputedValues}; use std::sync::Arc; use uuid; use string_cache::QualName; @@ -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); |