зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #19654 - style: Allow building stylo with rust nightly (from emilio:geckolib-nightly); r=jdm
See individual commits for details. Source-Repo: https://github.com/servo/servo Source-Revision: f71fb8bddc28060320c233701898541112322d66 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 8f8b2ccece94cc9df26c8c41afba04032fe9d506
This commit is contained in:
Родитель
f6cdb35b8f
Коммит
61f3d7e4e8
|
@ -1787,7 +1787,7 @@ impl<'le> Eq for GeckoElement<'le> {}
|
|||
impl<'le> Hash for GeckoElement<'le> {
|
||||
#[inline]
|
||||
fn hash<H: Hasher>(&self, state: &mut H) {
|
||||
(self.0 as *const _).hash(state);
|
||||
(self.0 as *const RawGeckoElement).hash(state);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -109,7 +109,6 @@ pub unsafe trait HasArcFFI : HasFFI {
|
|||
///
|
||||
/// &GeckoType -> &Arc<ServoType>
|
||||
fn as_arc<'a>(ptr: &'a &Self::FFIType) -> &'a RawOffsetArc<Self> {
|
||||
debug_assert!(!(ptr as *const _).is_null());
|
||||
unsafe {
|
||||
transmute::<&&Self::FFIType, &RawOffsetArc<Self>>(ptr)
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче