From 9c847dba9a35e843e50b2c0aeb2424e097699f3a Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 22 Mar 2014 11:53:53 +0100
Subject: [PATCH 1/3] Update to current rust: remove explicit borrow() calls.

---
 js.rc   |  2 +-
 rust.rs | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/js.rc b/js.rc
index 9e71b117f..11d5ff337 100644
--- a/js.rc
+++ b/js.rc
@@ -110,7 +110,7 @@ pub fn result(n: JSBool) -> Result<(),()> {
     if n != ERR {Ok(())} else {Err(())}
 }
 pub fn result_obj(o: jsobj) -> Result<jsobj, ()> {
-    if o.borrow().ptr != null() {Ok(o)} else {Err(())}
+    if o.deref().ptr != null() {Ok(o)} else {Err(())}
 }
 
 #[inline(always)]
diff --git a/rust.rs b/rust.rs
index 80a3423ee..72dc8747d 100644
--- a/rust.rs
+++ b/rust.rs
@@ -54,7 +54,7 @@ pub trait RtUtils {
 impl RtUtils for rc::Rc<rt_rsrc> {
     fn cx(&self) -> rc::Rc<Cx> {
         unsafe {
-            new_context(JS_NewContext(self.borrow().ptr,
+            new_context(JS_NewContext(self.deref().ptr,
                                       default_stacksize as size_t), self.clone())
         }
     }
@@ -116,17 +116,17 @@ pub trait CxUtils {
 
 impl CxUtils for rc::Rc<Cx> {
     fn rooted_obj(&self, obj: *JSObject) -> jsobj {
-        let cxptr = self.borrow().ptr;
+        let cxptr = self.deref().ptr;
         let jsobj = rc::Rc::new(jsobj_rsrc {cx: self.clone(), cxptr: cxptr, ptr: obj});
         unsafe {
-            JS_AddObjectRoot(cxptr, &jsobj.borrow().ptr);
+            JS_AddObjectRoot(cxptr, &jsobj.deref().ptr);
         }
         jsobj
     }
 
     fn new_compartment(&self, globcls: *JSClass) -> Result<rc::Rc<Compartment>,()> {
         unsafe {
-            let ptr = self.borrow().ptr;
+            let ptr = self.deref().ptr;
             let globobj = JS_NewGlobalObject(ptr, globcls, null());
             result(JS_InitStandardClasses(ptr, globobj)).and_then(|_ok| {
                 Ok(rc::Rc::new(Compartment {
@@ -237,14 +237,14 @@ pub struct Compartment {
 impl Compartment {
     pub fn define_functions(&self, specvec: &'static [JSFunctionSpec]) -> Result<(),()> {
         unsafe {
-            result(JS_DefineFunctions(self.cx.borrow().ptr,
+            result(JS_DefineFunctions(self.cx.deref().ptr,
                                       self.global_obj,
                                       specvec.as_ptr()))
         }
     }
     pub fn define_properties(&self, specvec: &'static [JSPropertySpec]) -> Result<(),()> {
         unsafe {
-            result(JS_DefineProperties(self.cx.borrow().ptr,
+            result(JS_DefineProperties(self.cx.deref().ptr,
                                        self.global_obj,
                                        specvec.as_ptr()))
         }
@@ -257,7 +257,7 @@ impl Compartment {
         -> Result<(),()> {
         unsafe {
             name.to_c_str().with_ref(|name| {
-                result(JS_DefineProperty(self.cx.borrow().ptr,
+                result(JS_DefineProperty(self.cx.deref().ptr,
                                          self.global_obj,
                                          name,
                                          value,
@@ -270,7 +270,7 @@ impl Compartment {
     pub fn new_object(&self, classptr: *JSClass, proto: *JSObject, parent: *JSObject)
                -> Result<jsobj, ()> {
         unsafe {
-            let obj = self.cx.rooted_obj(JS_NewObject(self.cx.borrow().ptr, classptr, proto, parent));
+            let obj = self.cx.rooted_obj(JS_NewObject(self.cx.deref().ptr, classptr, proto, parent));
             result_obj(obj)
         }
     }
@@ -317,7 +317,7 @@ impl to_jsstr for ~str {
     fn to_jsstr(self, cx: rc::Rc<Cx>) -> *JSString {
         unsafe {
             let cbuf = cast::transmute(self.as_ptr());
-            JS_NewStringCopyN(cx.borrow().ptr, cbuf, self.len() as size_t)
+            JS_NewStringCopyN(cx.deref().ptr, cbuf, self.len() as size_t)
         }
     }
 }
@@ -333,15 +333,15 @@ pub mod test {
     pub fn dummy() {
         let rt = rt();
         let cx = rt.cx();
-        cx.borrow().set_default_options_and_version();
-        cx.borrow().set_logging_error_reporter();
+        cx.deref().set_default_options_and_version();
+        cx.deref().set_logging_error_reporter();
         cx.new_compartment(&global::BASIC_GLOBAL).and_then(|comp| {
-            unsafe { JS_GC(JS_GetRuntime(cx.borrow().ptr)); }
+            unsafe { JS_GC(JS_GetRuntime(cx.deref().ptr)); }
 
-            comp.borrow().define_functions(global::DEBUG_FNS);
+            comp.deref().define_functions(global::DEBUG_FNS);
 
             let s = ~"debug(22);";
-            cx.borrow().evaluate_script(comp.borrow().global_obj, s, ~"test", 1u)
+            cx.deref().evaluate_script(comp.deref().global_obj, s, ~"test", 1u)
         });
     }
 

From 19d06bec1ff1868db91b7071ec88c0ed75a6a072 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 22 Mar 2014 11:54:16 +0100
Subject: [PATCH 2/3] Update to current rust: don't use libextra.

---
 js.rc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/js.rc b/js.rc
index 11d5ff337..5352e86ff 100644
--- a/js.rc
+++ b/js.rc
@@ -9,7 +9,6 @@
 
 #[allow(non_uppercase_statics, non_camel_case_types)];
 
-extern crate extra;
 extern crate green;
 extern crate serialize;
 

From 3db0ee11bc19a65050d519e2163cfba1a7c83c8b Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Sat, 22 Mar 2014 11:54:22 +0100
Subject: [PATCH 3/3] Update to current rust: import the logging macros.

---
 js.rc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js.rc b/js.rc
index 5352e86ff..50716489b 100644
--- a/js.rc
+++ b/js.rc
@@ -9,6 +9,9 @@
 
 #[allow(non_uppercase_statics, non_camel_case_types)];
 
+#[feature(phase)];
+#[phase(syntax, link)] extern crate log;
+
 extern crate green;
 extern crate serialize;