Tidy up

README.md

@@ -4,30 +4,4 @@ Rust bindings to SpiderMonkey
 
 [Documentation](http://doc.servo.org/mozjs/)
 
-## Setting up your environment
-
-### Rust
-
-This project requires Rust nightly-2018-03-25 or greater.
-For installation of the Rust toolchain see [`https://rustup.rs/`](https://rustup.rs/).
-
-### Other dependencies
-
-#### macOS
-#### On macOS (Homebrew)
-
-```sh
-brew install automake pkg-config python2 cmake
-```
-
-## Building the project
-
-```sh
-cargo build
-```
-
-## Testing the project
-
-```sh
-cargo test
-```
+See https://github.com/servo/mozjs/blob/master/README.md for build instructions.

build.rs

@@ -39,7 +39,6 @@ fn main() {
     if cfg!(target_os = "windows") {
         build.flag(&format!("-FI{}", confdefs_path.to_string_lossy()));
         build.define("WIN32", "");
-        build.define("XP_PC", "");
         build.flag("-Zi");
         build.flag("-GR-");
     } else {

src/jsglue.cpp

@@ -531,7 +531,7 @@ GetSecurityWrapper()
 JS::ReadOnlyCompileOptions*
 NewCompileOptions(JSContext* aCx, const char* aFile, unsigned aLine)
 {
-     JS::OwningCompileOptions *opts = new JS::OwningCompileOptions(aCx);
+    JS::OwningCompileOptions *opts = new JS::OwningCompileOptions(aCx);
     opts->setFileAndLine(aCx, aFile, aLine);
     return opts;
 }
@@ -574,28 +574,28 @@ GetWindowProxyClass()
     return &WindowProxyClass;
 }
 
-void
-GetProxyReservedSlot(JSObject* obj, uint32_t slot, JS::Value* dest)
+JSObject*
+NewWindowProxy(JSContext* aCx, JS::HandleObject aObj, const void* aHandler)
 {
-    *dest = js::GetProxyReservedSlot(obj, slot);
+    return WrapperNew(aCx, aObj, aHandler, Jsvalify(&WindowProxyClass), true);
 }
 
 void
-SetProxyReservedSlot(JSObject* obj, uint32_t slot, const JS::Value* val)
+GetProxyReservedSlot(JSObject* obj, uint32_t slot, JS::Value* dest)
 {
-    js::SetProxyReservedSlot(obj, slot, *val);
+    *dest = js::GetProxyReservedSlot(obj, slot);
 }
 
-JSObject*
-NewWindowProxy(JSContext* aCx, JS::HandleObject aObj, const void* aHandler)
+void
+GetProxyPrivate(JSObject* obj, JS::Value* dest)
 {
-    return WrapperNew(aCx, aObj, aHandler, Jsvalify(&WindowProxyClass), true);
+    *dest = js::GetProxyPrivate(obj);
 }
 
 void
-GetProxyPrivate(JSObject* obj, JS::Value* dest)
+SetProxyReservedSlot(JSObject* obj, uint32_t slot, const JS::Value* val)
 {
-    *dest = js::GetProxyPrivate(obj);
+    js::SetProxyReservedSlot(obj, slot, *val);
 }
 
 void

src/rust.rs

@@ -163,7 +163,7 @@ impl Runtime {
                 assert!(!parent_runtime.is_null());
                 let old_runtime = PARENT.compare_and_swap(ptr::null_mut(), parent_runtime, Ordering::SeqCst);
                 assert!(old_runtime.is_null());
-		assert!(UseInternalJobQueues(js_context, false));
+                assert!(UseInternalJobQueues(js_context, false));
                 js_context
             } else {
                 let parent_runtime = PARENT.load(Ordering::SeqCst);