From 176b3f7698ab32c473caf7a82d3759dc5cdd9cb1 Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Thu, 18 Sep 2014 15:30:38 -0700 Subject: [PATCH] Remove uses of &mut JSRef Since everything with JSRef happens with interior mutability, it doesn't make any sense to use an &mut JSRef. --- .../script/dom/bindings/codegen/CodegenRust.py | 13 ------------- components/script/dom/node.rs | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 4d0f8bdb682..bcf068eb5de 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -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(derived: Temporary) -> Temporary { unsafe { derived.transmute() } diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 50af3e637ae..e72e95052a6 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -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 = CharacterDataCast::to_mut_ref(text_node).unwrap(); + let prev_characterdata: &JSRef = CharacterDataCast::to_ref(text_node).unwrap(); let _ = prev_characterdata.AppendData(characterdata.Data()); self.remove_child(&child); },