зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
1bacbe435f
Коммит
766c939965
|
@ -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
|
||||
|
|
|
@ -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)]
|
||||
|
|
|
@ -1 +1 @@
|
|||
2016-08-19
|
||||
2016-08-23
|
||||
|
|
Загрузка…
Ссылка в новой задаче