diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2017-07-27 02:21:01 +0200 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2017-07-27 02:21:01 +0200 |
commit | a205c822647184165de1483c5c7f797097ddad0d (patch) | |
tree | 71761a894faa885ee8a190f6ba643d3bacbe1e2b /components/script/dom/bindings/js.rs | |
parent | 27031b996b905bbe42234729a63352cd7579f0fa (diff) | |
download | servo-a205c822647184165de1483c5c7f797097ddad0d.tar.gz servo-a205c822647184165de1483c5c7f797097ddad0d.zip |
Upgrade to rustc 1.21.0-nightly (599be0d18 2017-07-26)
Diffstat (limited to 'components/script/dom/bindings/js.rs')
-rw-r--r-- | components/script/dom/bindings/js.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/script/dom/bindings/js.rs b/components/script/dom/bindings/js.rs index 292324f04d0..975ddeda13b 100644 --- a/components/script/dom/bindings/js.rs +++ b/components/script/dom/bindings/js.rs @@ -81,7 +81,7 @@ impl<T: DomObject> JS<T> { pub fn from_ref(obj: &T) -> JS<T> { debug_assert!(thread_state::get().is_script()); JS { - ptr: unsafe { NonZero::new(&*obj) }, + ptr: unsafe { NonZero::new_unchecked(&*obj) }, } } } @@ -135,7 +135,7 @@ impl<T: Castable> LayoutJS<T> { debug_assert!(thread_state::get().is_layout()); let ptr: *const T = self.ptr.get(); LayoutJS { - ptr: unsafe { NonZero::new(ptr as *const U) }, + ptr: unsafe { NonZero::new_unchecked(ptr as *const U) }, } } @@ -148,7 +148,7 @@ impl<T: Castable> LayoutJS<T> { if (*self.unsafe_get()).is::<U>() { let ptr: *const T = self.ptr.get(); Some(LayoutJS { - ptr: NonZero::new(ptr as *const U), + ptr: NonZero::new_unchecked(ptr as *const U), }) } else { None @@ -223,7 +223,7 @@ impl LayoutJS<Node> { debug_assert!(thread_state::get().is_layout()); let TrustedNodeAddress(addr) = inner; LayoutJS { - ptr: NonZero::new(addr as *const Node), + ptr: NonZero::new_unchecked(addr as *const Node), } } } @@ -554,7 +554,7 @@ impl<T: DomObject> Root<T> { /// Generate a new root from a reference pub fn from_ref(unrooted: &T) -> Root<T> { - Root::new(unsafe { NonZero::new(unrooted) }) + Root::new(unsafe { NonZero::new_unchecked(unrooted) }) } } |