diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-08-23 10:09:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-23 10:09:49 -0500 |
| commit | 6f22251e6599aa529ce024d8618595be765c9a18 (patch) | |
| tree | 86416adc209e145e998f51697c8f7b480e84405d /components/script | |
| parent | 8e890be2c6c736f503cafe2641cbd869e571ec7f (diff) | |
| parent | e034117152c27bb7e901a25c8bbfd4a5e0ed2e67 (diff) | |
| download | servo-6f22251e6599aa529ce024d8618595be765c9a18.tar.gz servo-6f22251e6599aa529ce024d8618595be765c9a18.zip | |
Auto merge of #12997 - servo:rustup, r=Ms2ger
Update Rust to 1.13.0-nightly (3c5a0fa45 2016-08-22)
<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12997)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/bindings/cell.rs | 6 | ||||
| -rw-r--r-- | components/script/lib.rs | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/components/script/dom/bindings/cell.rs b/components/script/dom/bindings/cell.rs index 29c4f8bad09..d1b40af5b1a 100644 --- a/components/script/dom/bindings/cell.rs +++ b/components/script/dom/bindings/cell.rs @@ -29,7 +29,7 @@ impl<T> DOMRefCell<T> { #[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<T> DOMRefCell<T> { // 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<T> DOMRefCell<T> { #[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/components/script/lib.rs b/components/script/lib.rs index bf5e7807a80..0f28a2b065c 100644 --- a/components/script/lib.rs +++ b/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)] |