From 62aff9408746d3300fbe048b0db68c429c0eed4c Mon Sep 17 00:00:00 2001
From: Cameron Zwarich <zwarich@mozilla.com>
Date: Thu, 18 Sep 2014 22:25:48 -0700
Subject: [PATCH] servo: Merge #3416 - Remove uses of &mut JSRef (from
 zwarich:remove-jsref-mut)

Source-Repo: https://github.com/servo/servo
Source-Revision: d7ffe7a19864689735fa96b34c7a26baf97910a3
---
 .../script/dom/bindings/codegen/CodegenRust.py      | 13 -------------
 servo/components/script/dom/node.rs                 |  2 +-
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/servo/components/script/dom/bindings/codegen/CodegenRust.py b/servo/components/script/dom/bindings/codegen/CodegenRust.py
index 4d0f8bdb6826..bcf068eb5de4 100644
--- a/servo/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/servo/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<T: ${fromBound}+Reflectable>(derived: Temporary<T>) -> Temporary<Self> {
     unsafe { derived.transmute() }
diff --git a/servo/components/script/dom/node.rs b/servo/components/script/dom/node.rs
index 50af3e637ae2..e72e95052a65 100644
--- a/servo/components/script/dom/node.rs
+++ b/servo/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<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);
                         },