Skip to content

Commit

Permalink
Update Rust to 1.13.0-nightly (3c5a0fa45 2016-08-22)
Browse files Browse the repository at this point in the history
  • Loading branch information
nox committed Aug 23, 2016
1 parent f863a7c commit e034117
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions components/script/dom/bindings/cell.rs
Expand Up @@ -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.
Expand All @@ -41,15 +41,15 @@ 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.
///
#[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
Expand Down
1 change: 0 additions & 1 deletion components/script/lib.rs
Expand Up @@ -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)]
Expand Down
2 changes: 1 addition & 1 deletion rust-nightly-date
@@ -1 +1 @@
2016-08-19
2016-08-23

0 comments on commit e034117

Please sign in to comment.