From 766c939965d45189c8129223acfd87d16f6fa0d3 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Tue, 23 Aug 2016 10:09:49 -0500 Subject: [PATCH] servo: Merge #12997 - Update Rust to 1.13.0-nightly (3c5a0fa45 2016-08-22) (from servo:rustup); r=Ms2ger Source-Repo: https://github.com/servo/servo Source-Revision: 6f22251e6599aa529ce024d8618595be765c9a18 --- servo/components/script/dom/bindings/cell.rs | 6 +++--- servo/components/script/lib.rs | 1 - servo/rust-nightly-date | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/servo/components/script/dom/bindings/cell.rs b/servo/components/script/dom/bindings/cell.rs index 29c4f8bad09b..d1b40af5b1a1 100644 --- a/servo/components/script/dom/bindings/cell.rs +++ b/servo/components/script/dom/bindings/cell.rs @@ -29,7 +29,7 @@ impl DOMRefCell { #[allow(unsafe_code)] pub unsafe fn borrow_for_layout(&self) -> &T { debug_assert!(thread_state::get().is_layout()); - &*self.value.as_unsafe_cell().get() + &*self.value.as_ptr() } /// Borrow the contents for the purpose of GC tracing. @@ -41,7 +41,7 @@ impl DOMRefCell { // FIXME: IN_GC isn't reliable enough - doesn't catch minor GCs // https://github.com/servo/servo/issues/6389 // debug_assert!(thread_state::get().contains(SCRIPT | IN_GC)); - &*self.value.as_unsafe_cell().get() + &*self.value.as_ptr() } /// Borrow the contents for the purpose of script deallocation. @@ -49,7 +49,7 @@ impl DOMRefCell { #[allow(unsafe_code)] pub unsafe fn borrow_for_script_deallocation(&self) -> &mut T { debug_assert!(thread_state::get().contains(SCRIPT)); - &mut *self.value.as_unsafe_cell().get() + &mut *self.value.as_ptr() } /// Version of the above that we use during restyle while the script thread diff --git a/servo/components/script/lib.rs b/servo/components/script/lib.rs index bf5e7807a800..0f28a2b065c0 100644 --- a/servo/components/script/lib.rs +++ b/servo/components/script/lib.rs @@ -2,7 +2,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#![feature(as_unsafe_cell)] #![feature(box_syntax)] #![feature(conservative_impl_trait)] #![feature(const_fn)] diff --git a/servo/rust-nightly-date b/servo/rust-nightly-date index 3aeaf3b66d67..02e42b37add6 100644 --- a/servo/rust-nightly-date +++ b/servo/rust-nightly-date @@ -1 +1 @@ -2016-08-19 +2016-08-23