diff options
| author | Jack Moffitt <jack@metajack.im> | 2014-07-21 07:37:24 -0600 |
|---|---|---|
| committer | Jack Moffitt <jack@metajack.im> | 2014-08-02 21:11:47 -0600 |
| commit | b91e6f30e063cbcea4ffd750da8385ce448de797 (patch) | |
| tree | 3e762f7866e29379810ac1e612f7942979e21b87 /src/components/layout/util.rs | |
| parent | 8b6f62c195dd7e42d0b6a18f2ced6fa16bc29faa (diff) | |
| download | servo-b91e6f30e063cbcea4ffd750da8385ce448de797.tar.gz servo-b91e6f30e063cbcea4ffd750da8385ce448de797.zip | |
Upgrade Rust.
Diffstat (limited to 'src/components/layout/util.rs')
| -rw-r--r-- | src/components/layout/util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/components/layout/util.rs b/src/components/layout/util.rs index 4f05a18f5ce..a0e466e8875 100644 --- a/src/components/layout/util.rs +++ b/src/components/layout/util.rs @@ -67,7 +67,7 @@ pub struct LayoutDataWrapper { /// A trait that allows access to the layout data of a DOM node. pub trait LayoutDataAccess { /// Borrows the layout data without checks. - unsafe fn borrow_layout_data_unchecked(&self) -> *Option<LayoutDataWrapper>; + unsafe fn borrow_layout_data_unchecked(&self) -> *const Option<LayoutDataWrapper>; /// Borrows the layout data immutably. Fails on a conflicting borrow. fn borrow_layout_data<'a>(&'a self) -> Ref<'a,Option<LayoutDataWrapper>>; /// Borrows the layout data mutably. Fails on a conflicting borrow. @@ -76,7 +76,7 @@ pub trait LayoutDataAccess { impl<'ln> LayoutDataAccess for LayoutNode<'ln> { #[inline(always)] - unsafe fn borrow_layout_data_unchecked(&self) -> *Option<LayoutDataWrapper> { + unsafe fn borrow_layout_data_unchecked(&self) -> *const Option<LayoutDataWrapper> { mem::transmute(self.get().layout_data.borrow_unchecked()) } |