diff options
author | Anthony Ramine <nox@nox.paris> | 2020-03-30 12:19:28 +0200 |
---|---|---|
committer | Anthony Ramine <nox@nox.paris> | 2020-03-30 13:09:03 +0200 |
commit | 02fb5a68e6285d86c0a091e4c6ac36a7d436d3f1 (patch) | |
tree | c2404ad5704124944a5e226aa89bab60361b6565 /components/script/dom/element.rs | |
parent | ba5bcec7e4e182510c12d43321c910f2fd139edb (diff) | |
download | servo-02fb5a68e6285d86c0a091e4c6ac36a7d436d3f1.tar.gz servo-02fb5a68e6285d86c0a091e4c6ac36a7d436d3f1.zip |
Remove a bunch of _forever suffixes in Attr methods
They don't return &'static references anymore.
Diffstat (limited to 'components/script/dom/element.rs')
-rw-r--r-- | components/script/dom/element.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index b1472fd6791..602cb148d7a 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -578,7 +578,7 @@ pub unsafe fn get_attr_for_layout<'dom>( .iter() .find(|attr| { let attr = attr.to_layout(); - *name == attr.local_name_atom_forever() && (*attr.unsafe_get()).namespace() == namespace + *name == attr.local_name_atom() && (*attr.unsafe_get()).namespace() == namespace }) .map(|attr| attr.to_layout()) } @@ -591,7 +591,7 @@ impl RawLayoutElementHelpers for Element { namespace: &Namespace, name: &LocalName, ) -> Option<&'a AttrValue> { - get_attr_for_layout(self, namespace, name).map(|attr| attr.value_forever()) + get_attr_for_layout(self, namespace, name).map(|attr| attr.value()) } #[inline] @@ -610,8 +610,8 @@ impl RawLayoutElementHelpers for Element { .iter() .filter_map(|attr| { let attr = attr.to_layout(); - if *name == attr.local_name_atom_forever() { - Some(attr.value_forever()) + if *name == attr.local_name_atom() { + Some(attr.value()) } else { None } @@ -656,7 +656,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class")).map_or( false, |attr| { - attr.value_tokens_forever() + attr.value_tokens() .unwrap() .iter() .any(|atom| case_sensitivity.eq_atom(atom, name)) @@ -668,7 +668,7 @@ impl<'dom> LayoutElementHelpers<'dom> for LayoutDom<'dom, Element> { #[inline] unsafe fn get_classes_for_layout(self) -> Option<&'dom [Atom]> { get_attr_for_layout(&*self.unsafe_get(), &ns!(), &local_name!("class")) - .map(|attr| attr.value_tokens_forever().unwrap()) + .map(|attr| attr.value_tokens().unwrap()) } #[allow(unsafe_code)] |