servo: Merge #3416 - Remove uses of &mut JSRef (from zwarich:remove-jsref-mut)

Source-Repo: https://github.com/servo/servo
Source-Revision: d7ffe7a19864689735fa96b34c7a26baf97910a3
This commit is contained in:
Cameron Zwarich 2014-09-18 22:25:48 -07:00
Родитель eed0b64a88
Коммит 62aff94087
2 изменённых файлов: 1 добавлений и 14 удалений

Просмотреть файл

@ -5478,24 +5478,11 @@ class GlobalGenRoots():
}
}
#[inline(always)]
fn to_mut_ref<'a, 'b, T: ${toBound}+Reflectable>(base: &'a mut JSRef<'b, T>) -> Option<&'a mut JSRef<'b, Self>> {
match base.deref().${checkFn}() {
true => unsafe { Some(base.transmute_mut()) },
false => None
}
}
#[inline(always)]
fn from_ref<'a, 'b, T: ${fromBound}>(derived: &'a JSRef<'b, T>) -> &'a JSRef<'b, Self> {
unsafe { derived.transmute() }
}
#[inline(always)]
fn from_mut_ref<'a, 'b, T: ${fromBound}>(derived: &'a mut JSRef<'b, T>) -> &'a mut JSRef<'b, Self> {
unsafe { derived.transmute_mut() }
}
#[inline(always)]
fn from_temporary<T: ${fromBound}+Reflectable>(derived: Temporary<T>) -> Temporary<Self> {
unsafe { derived.transmute() }

Просмотреть файл

@ -1779,7 +1779,7 @@ impl<'a> NodeMethods for JSRef<'a, Node> {
} else {
match prev_text {
Some(ref mut text_node) => {
let prev_characterdata: &mut JSRef<CharacterData> = CharacterDataCast::to_mut_ref(text_node).unwrap();
let prev_characterdata: &JSRef<CharacterData> = CharacterDataCast::to_ref(text_node).unwrap();
let _ = prev_characterdata.AppendData(characterdata.Data());
self.remove_child(&child);
},