aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/wrapper.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-05-07 16:42:46 +0200
committerSimon Sapin <simon.sapin@exyr.org>2017-05-08 12:46:03 +0200
commit02e1901bc15812dfc74b4979e0951bf7593e7fc9 (patch)
tree7758970f50502206f1d264201069bbaea2eb28fd /components/layout/wrapper.rs
parentbd2cd40c5029f3124f2ed492b4fab7dc8f9101c8 (diff)
downloadservo-02e1901bc15812dfc74b4979e0951bf7593e7fc9.tar.gz
servo-02e1901bc15812dfc74b4979e0951bf7593e7fc9.zip
Upgrade to rustc 1.19.0-nightly (ced823e26 2017-05-07)
Diffstat (limited to 'components/layout/wrapper.rs')
-rw-r--r--components/layout/wrapper.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index eb110a90e7a..9ceee25a718 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -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 }
})
}