From b731832de6c591674e2a17befe91281d44f52d29 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Tue, 16 Sep 2014 11:40:07 -0700
Subject: [PATCH 1/2] Rust upgrade

---
 src/lib.rs  |  8 ++++----
 src/rust.rs | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index bdeabf400..66ae05275 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -26,12 +26,12 @@ use jsapi::JS_ComputeThis;
 use jsval::JSVal;
 
 // These are just macros in jsapi.h
-pub use JS_NewRuntime = jsapi::JS_Init;
-pub use JS_DestroyRuntime = jsapi::JS_Finish;
+pub use jsapi::JS_Init as JS_NewRuntime;
+pub use jsapi::JS_Finish as JS_DestroyRuntime;
 /*
 FIXME: Not sure where JS_Lock is
-pub use JS_LockRuntime = jsapi::bindgen::JS_Lock;
-pub use JS_UnlockRuntime = jsapi::bindgen::JS_Unlock;
+pub use jsapi::bindgen::JS_Lock as JS_LockRuntime;
+pub use jsapi::bindgen::JS_Unlock as JS_UnlockRuntime;
 */
 
 pub use jsfriendapi::JSJitInfo;
diff --git a/src/rust.rs b/src/rust.rs
index 1f23807f6..556a8d853 100644
--- a/src/rust.rs
+++ b/src/rust.rs
@@ -5,6 +5,7 @@
 //! Rust wrappers around the raw JS apis
 
 use libc::types::os::arch::c95::{size_t, c_uint};
+use libc::uintptr_t;
 use libc::c_char;
 use std::cmp;
 use std::rc;
@@ -56,14 +57,15 @@ impl RtUtils for rc::Rc<rt_rsrc> {
     }
 }
 
-extern fn gc_callback(rt: *mut JSRuntime, _status: JSGCStatus) {
+unsafe extern fn gc_callback(rt: *mut JSRuntime, _status: JSGCStatus) {
     use std::rt::local::Local;
     use std::rt::task::Task;
     unsafe {
         let mut task = Local::borrow(None::<Task>);
         let green_task: Box<GreenTask> = task.maybe_take_runtime().unwrap();
         let (start, end) = green_task.stack_bounds();
-        JS_SetNativeStackBounds(rt, cmp::min(start, end), cmp::max(start, end));
+        JS_SetNativeStackBounds(rt, cmp::min(start, end) as uintptr_t,
+                                    cmp::max(start, end) as uintptr_t);
         task.put_runtime(green_task);
     }
 }
@@ -161,14 +163,12 @@ impl Cx {
     }
 }
 
-pub extern fn reportError(_cx: *mut JSContext, msg: *const c_char, report: *mut JSErrorReport) {
-    unsafe {
-        let fnptr = (*report).filename;
-        let fname = if fnptr.is_not_null() {string::raw::from_buf(fnptr as *const i8 as *const u8)} else {"none".to_string()};
-        let lineno = (*report).lineno;
-        let msg = string::raw::from_buf(msg as *const i8 as *const u8);
-        error!("Error at {:s}:{}: {:s}\n", fname, lineno, msg);
-    }
+pub unsafe extern fn reportError(_cx: *mut JSContext, msg: *const c_char, report: *mut JSErrorReport) {
+    let fnptr = (*report).filename;
+    let fname = if fnptr.is_not_null() {string::raw::from_buf(fnptr as *const i8 as *const u8)} else {"none".to_string()};
+    let lineno = (*report).lineno;
+    let msg = string::raw::from_buf(msg as *const i8 as *const u8);
+    error!("Error at {:s}:{}: {:s}\n", fname, lineno, msg);
 }
 
 pub fn with_compartment<R>(cx: *mut JSContext, object: *mut JSObject, cb: || -> R) -> R {

From c151eb31d0c6c96b5fe1819ff23bfab935a543e9 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Tue, 16 Sep 2014 16:25:46 -0700
Subject: [PATCH 2/2] Store unsafe fns in ProxyTraps fields

---
 src/glue.rs | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/glue.rs b/src/glue.rs
index 81ccd30f3..8decabc1d 100644
--- a/src/glue.rs
+++ b/src/glue.rs
@@ -12,35 +12,35 @@ use jsval::JSVal;
 pub static JS_STRUCTURED_CLONE_VERSION: u32 = 1;
 
 pub struct ProxyTraps {
-    pub getPropertyDescriptor: Option<extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool>,
-    pub getOwnPropertyDescriptor: Option<extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool>,
-    pub defineProperty: Option<extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut JSPropertyDescriptor) -> bool>,
+    pub getPropertyDescriptor: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool>,
+    pub getOwnPropertyDescriptor: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, bool, *mut JSPropertyDescriptor) -> bool>,
+    pub defineProperty: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut JSPropertyDescriptor) -> bool>,
     pub getOwnPropertyNames: *const u8, //XXX need a representation for AutoIdVector&
-    pub delete_: Option<extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool>,
+    pub delete_: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool>,
     pub enumerate: *const u8, //XXX need a representation for AutoIdVector&
 
-    pub has: Option<extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool>,
-    pub hasOwn: Option<extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool>,
-    pub get: Option<extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, *mut JSVal) -> bool>,
-    pub set: Option<extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, bool, *mut JSVal) -> bool>,
+    pub has: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool>,
+    pub hasOwn: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, jsid, *mut bool) -> bool>,
+    pub get: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, *mut JSVal) -> bool>,
+    pub set: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, jsid, bool, *mut JSVal) -> bool>,
     pub keys: *const u8, //XXX need a representation for AutoIdVector&
-    pub iterate: Option<extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal) -> bool>,
+    pub iterate: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal) -> bool>,
 
-    pub call: Option<extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal) -> bool>,
-    pub construct: Option<extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal, *mut JSVal) -> bool>,
+    pub call: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal) -> bool>,
+    pub construct: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal, *mut JSVal) -> bool>,
     pub nativeCall: *const u8, //XXX need a representation for IsAcceptableThis, NativeImpl, and CallArgs
-    pub hasInstance: Option<extern "C" fn(*mut JSContext, *mut JSObject, *mut JSVal, *mut bool) -> bool>,
-    pub typeOf: Option<extern "C" fn(*mut JSContext, *mut JSObject) -> uint>, //XXX JSType enum
-    pub objectClassIs: Option<extern "C" fn(*mut JSObject, uint, *mut JSContext) -> bool>, //XXX ESClassValue enum
-    pub obj_toString: Option<extern "C" fn(*mut JSContext, *mut JSObject) -> *mut JSString>,
-    pub fun_toString: Option<extern "C" fn(*mut JSContext, *mut JSObject, uint) -> *mut JSString>,
+    pub hasInstance: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSVal, *mut bool) -> bool>,
+    pub typeOf: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject) -> uint>, //XXX JSType enum
+    pub objectClassIs: Option<unsafe extern "C" fn(*mut JSObject, uint, *mut JSContext) -> bool>, //XXX ESClassValue enum
+    pub obj_toString: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject) -> *mut JSString>,
+    pub fun_toString: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, uint) -> *mut JSString>,
     //regexp_toShared: *u8,
-    pub defaultValue: Option<extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal) -> bool>, //XXX JSType enum
-    pub iteratorNext: Option<extern "C" fn(*mut JSContext, *mut JSObject, *mut JSVal) -> bool>,
-    pub finalize: Option<extern "C" fn(*mut JSFreeOp, *mut JSObject)>,
-    pub getElementIfPresent: Option<extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, u32, *mut JSVal, *mut bool) -> bool>,
-    pub getPrototypeOf: Option<extern "C" fn(*mut JSContext, *mut JSObject, *mut *mut JSObject) -> bool>,
-    pub trace: Option<extern "C" fn(*mut JSTracer, *mut JSObject)>,
+    pub defaultValue: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, uint, *mut JSVal) -> bool>, //XXX JSType enum
+    pub iteratorNext: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSVal) -> bool>,
+    pub finalize: Option<unsafe extern "C" fn(*mut JSFreeOp, *mut JSObject)>,
+    pub getElementIfPresent: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut JSObject, u32, *mut JSVal, *mut bool) -> bool>,
+    pub getPrototypeOf: Option<unsafe extern "C" fn(*mut JSContext, *mut JSObject, *mut *mut JSObject) -> bool>,
+    pub trace: Option<unsafe extern "C" fn(*mut JSTracer, *mut JSObject)>,
 }
 
 #[link(name = "jsglue")]