mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
Auto merge of #16756 - servo:rustup, r=jdm
Upgrade to rustc 1.19.0-nightly (ced823e26 2017-05-07) <!-- 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/16756) <!-- Reviewable:end -->
This commit is contained in:
commit
19706085a7
10 changed files with 37 additions and 37 deletions
|
@ -43,7 +43,7 @@ use style::selector_parser::RestyleDamage;
|
|||
pub type NonOpaqueStyleAndLayoutData = AtomicRefCell<PersistentLayoutData>;
|
||||
|
||||
pub unsafe fn drop_style_and_layout_data(data: OpaqueStyleAndLayoutData) {
|
||||
let ptr: *mut AtomicRefCell<PartialPersistentLayoutData> = *data.ptr;
|
||||
let ptr: *mut AtomicRefCell<PartialPersistentLayoutData> = data.ptr.get();
|
||||
let non_opaque: *mut NonOpaqueStyleAndLayoutData = ptr as *mut _;
|
||||
let _ = Box::from_raw(non_opaque);
|
||||
}
|
||||
|
@ -77,7 +77,7 @@ pub trait GetRawData {
|
|||
impl<T: GetLayoutData> GetRawData for T {
|
||||
fn get_raw_data(&self) -> Option<&NonOpaqueStyleAndLayoutData> {
|
||||
self.get_style_and_layout_data().map(|opaque| {
|
||||
let container = *opaque.ptr as *mut NonOpaqueStyleAndLayoutData;
|
||||
let container = opaque.ptr.get() as *mut NonOpaqueStyleAndLayoutData;
|
||||
unsafe { &*container }
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue