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 -->
This commit is contained in:
bors-servo 2015-05-20 01:55:43 -05:00
commit 6481058309
2 changed files with 7 additions and 7 deletions

View file

@ -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.