diff options
| author | bors-servo <metajack+bors@gmail.com> | 2014-12-27 12:27:46 -0700 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2014-12-27 12:27:46 -0700 |
| commit | dbb10747828b08f5dc9bcaea251e1f2d16f554fd (patch) | |
| tree | 6e2a75d1768845294e6603941cac824e8b070432 /components | |
| parent | b139574cdc3ce622568253e0ff9d2e1750128b26 (diff) | |
| parent | 0031498e6bb5c4301c411a2844e8936967a5239b (diff) | |
| download | servo-dbb10747828b08f5dc9bcaea251e1f2d16f554fd.tar.gz servo-dbb10747828b08f5dc9bcaea251e1f2d16f554fd.zip | |
auto merge of #4490 : Ms2ger/servo/transmutes, r=jdm
Diffstat (limited to 'components')
| -rw-r--r-- | components/layout/css/matching.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/element.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs index 656d08bcbc2..e4d6b767c34 100644 --- a/components/layout/css/matching.rs +++ b/components/layout/css/matching.rs @@ -460,7 +460,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> { }; let parent_layout_data: &Option<LayoutDataWrapper> = unsafe { - mem::transmute(parent_node.borrow_layout_data_unchecked()) + &*parent_node.borrow_layout_data_unchecked() }; match parent_layout_data { &Some(ref parent_layout_data_ref) => { diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index c5cf98177af..a399ecbb5e4 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -226,8 +226,8 @@ pub trait RawLayoutElementHelpers { #[inline] unsafe fn get_attr_for_layout<'a>(elem: &'a Element, namespace: &Namespace, name: &Atom) -> Option<&'a JS<Attr>> { // cast to point to T in RefCell<T> directly - let attrs: *const Vec<JS<Attr>> = mem::transmute(&elem.attrs); - (*attrs).iter().find(|attr: & &JS<Attr>| { + let attrs = elem.attrs.borrow_for_layout(); + attrs.iter().find(|attr: & &JS<Attr>| { let attr = attr.unsafe_get(); *name == (*attr).local_name_atom_forever() && (*attr).namespace() == namespace |