Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #19654 - emilio:geckolib-nightly, r=jdm

Browse source 
style: Allow building stylo with rust nightly.

See individual commits for details.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19654)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2018-01-03 12:01:42 -06:00 • committed by GitHub
commit f71fb8bddc
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/gecko/wrapper.rs
View file

@ -1787,7 +1787,7 @@ impl<'le> Eq for GeckoElement<'le> {}
impl<'le> Hash for GeckoElement<'le> { impl<'le> Hash for GeckoElement<'le> {
#[inline] #[inline]
fn hash<H: Hasher>(&self, state: &mut H) { fn hash<H: Hasher>(&self, state: &mut H) {
(self.0 as *const _).hash(state); (self.0 as *const RawGeckoElement).hash(state);
} }
} }

1
components/style/gecko_bindings/sugar/ownership.rs
View file

@ -109,7 +109,6 @@ pub unsafe trait HasArcFFI : HasFFI {
/// ///
/// &GeckoType -> &Arc<ServoType> /// &GeckoType -> &Arc<ServoType>
fn as_arc<'a>(ptr: &'a &Self::FFIType) -> &'a RawOffsetArc<Self> { fn as_arc<'a>(ptr: &'a &Self::FFIType) -> &'a RawOffsetArc<Self> {
debug_assert!(!(ptr as *const _).is_null());
unsafe { unsafe {
transmute::<&&Self::FFIType, &RawOffsetArc<Self>>(ptr) transmute::<&&Self::FFIType, &RawOffsetArc<Self>>(ptr)
} }