diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-20 01:55:43 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-20 01:55:43 -0500 |
| commit | 64810583093dadfacbda942562853af1ae82e34e (patch) | |
| tree | e04441a4d472dfbaa666f34e195e9267ae348a44 /components/script | |
| parent | d869a3c7a8378a77a9a5e86c118115f969ade193 (diff) | |
| parent | 7772984e0b5eb48a3e5ee63efa2050baf1a7fef7 (diff) | |
| download | servo-64810583093dadfacbda942562853af1ae82e34e.tar.gz servo-64810583093dadfacbda942562853af1ae82e34e.zip | |
Auto merge of #6139 - michaelwu:rustup-fixes, r=SimonSapin
Mutable transmutes and wrong transmutes fixed.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6139)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/node.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 789d2920832..ec707cd3e02 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -245,7 +245,7 @@ impl LayoutDataRef { #[inline] #[allow(unsafe_code)] pub unsafe fn borrow_unchecked(&self) -> *const Option<LayoutData> { - mem::transmute(&self.data_cell) + self.data_cell.as_unsafe_cell().get() as *const _ } /// Borrows the layout data immutably. This function is *not* thread-safe. |