diff options
author | Ms2ger <ms2ger@gmail.com> | 2015-01-02 12:45:28 +0100 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2015-01-08 09:58:46 -0500 |
commit | 16c7060bc8ff91527ae97f8a3feee5706747b9c5 (patch) | |
tree | 0cc29f2cc50c729d3a8f9521a22991fad67b9afd /components/script/dom/element.rs | |
parent | cf616b90a236f88058dbad74b568b4d4379d2829 (diff) | |
download | servo-16c7060bc8ff91527ae97f8a3feee5706747b9c5.tar.gz servo-16c7060bc8ff91527ae97f8a3feee5706747b9c5.zip |
Update rustc to revision 2cfb5acb5a2751c759627377e602bac4f88f2d19.
Diffstat (limited to 'components/script/dom/element.rs')
-rw-r--r-- | components/script/dom/element.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 7730b657215..ec43612be70 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -86,7 +86,7 @@ impl ElementDerived for EventTarget { } } -#[deriving(PartialEq, Show)] +#[deriving(Copy, PartialEq, Show)] #[jstraceable] pub enum ElementTypeId { HTMLElement(HTMLElementTypeId), @@ -591,7 +591,7 @@ pub trait AttributeHandlers { impl<'a> AttributeHandlers for JSRef<'a, Element> { fn get_attribute(self, namespace: Namespace, local_name: &Atom) -> Option<Temporary<Attr>> { - self.get_attributes(local_name).iter().map(|attr| attr.root()) + self.get_attributes(local_name).into_iter().map(|attr| attr.root()) .find(|attr| *attr.r().namespace() == namespace) .map(|x| Temporary::from_rooted(x.r())) } @@ -841,9 +841,9 @@ impl<'a> ElementMethods for JSRef<'a, Element> { Some(ref prefix) => { (format!("{}:{}", prefix.as_slice(), - self.local_name.as_slice())).into_maybe_owned() + self.local_name.as_slice())).into_cow() }, - None => self.local_name.as_slice().into_maybe_owned() + None => self.local_name.as_slice().into_cow() }; if self.html_element_in_html_document() { qualified_name.as_slice().to_ascii_upper() @@ -1290,7 +1290,7 @@ impl<'a> style::TElement<'a> for JSRef<'a, Element> { }) } fn get_attrs(self, attr: &Atom) -> Vec<&'a str> { - self.get_attributes(attr).iter().map(|attr| attr.root()).map(|attr| { + self.get_attributes(attr).into_iter().map(|attr| attr.root()).map(|attr| { // This transmute is used to cheat the lifetime restriction. unsafe { mem::transmute(attr.r().value().as_slice()) } }).collect() |