Auto merge of #358 - servo:rustup, r=nox

bors-servo · web-flow · commit a88d705e7b9a · 2017-05-07T09:07:55.000-05:00
Upgrade to rustc 1.19.0-nightly (ced823e26 2017-05-07)  This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-mozjs/358)
diff --git a/src/conversions.rs b/src/conversions.rs
@@ -659,7 +659,7 @@ impl ToJSValConvertible for *mut JSObject {
 impl ToJSValConvertible for NonZero<*mut JSObject> {
     #[inline]
     unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {
-        rval.set(ObjectValue(**self));
+        rval.set(ObjectValue(self.get()));
         maybe_wrap_object_value(cx, rval);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ impl ToJSValConvertible for *mut JSObject {`
`659`	`659`	`impl ToJSValConvertible for NonZero<*mut JSObject> {`
`660`	`660`	`#[inline]`
`661`	`661`	`unsafe fn to_jsval(&self, cx: *mut JSContext, rval: MutableHandleValue) {`
`662`		`- rval.set(ObjectValue(**self));`
	`662`	`+ rval.set(ObjectValue(self.get()));`
`663`	`663`	`maybe_wrap_object_value(cx, rval);`
`664`	`664`	`}`
`665`	`665`	`}`