Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 23:33:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove a bunch of _forever suffixes in Attr methods

Browse source 
They don't return &'static references anymore.
This commit is contained in:
Anthony Ramine 2020-03-30 12:19:28 +02:00
parent ba5bcec7e4
commit 02fb5a68e6
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/script/dom/attr.rs
View file

@ -234,35 +234,35 @@ impl Attr {
#[allow(unsafe_code)]
pub trait AttrHelpersForLayout<'dom> {
unsafe fn value_forever(self) -> &'dom AttrValue;
unsafe fn value(self) -> &'dom AttrValue;
unsafe fn value_ref_forever(self) -> &'dom str;
unsafe fn value_tokens_forever(self) -> Option<&'dom [Atom]>;
unsafe fn local_name_atom_forever(self) -> LocalName;
unsafe fn value_tokens(self) -> Option<&'dom [Atom]>;
unsafe fn local_name_atom(self) -> LocalName;
}
#[allow(unsafe_code)]
impl<'dom> AttrHelpersForLayout<'dom> for LayoutDom<'dom, Attr> {
#[inline]
unsafe fn value_forever(self) -> &'dom AttrValue {
unsafe fn value(self) -> &'dom AttrValue {
(*self.unsafe_get()).value.borrow_for_layout()
}
#[inline]
unsafe fn value_ref_forever(self) -> &'dom str {
&**self.value_forever()
&**self.value()
}
#[inline]
unsafe fn value_tokens_forever(self) -> Option<&'dom [Atom]> {
unsafe fn value_tokens(self) -> Option<&'dom [Atom]> {
// This transmute is used to cheat the lifetime restriction.
match *self.value_forever() {
match *self.value() {
AttrValue::TokenList(_, ref tokens) => Some(tokens),
_ => None,
}
}
#[inline]
unsafe fn local_name_atom_forever(self) -> LocalName {
unsafe fn local_name_atom(self) -> LocalName {
(*self.unsafe_get()).identifier.local_name.clone()
}
}