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

Auto merge of #18875 - servo:stable-js, r=nox,jdm

Browse source 
Remove the need for rust-mozjs to use unstable Rust features

<!-- 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/18875)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-10-16 17:07:50 -05:00 • committed by GitHub
commit e8a6f2862c
44 changed files with 268 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script_layout_interface/lib.rs
View file

@ -45,10 +45,9 @@ use canvas_traits::canvas::CanvasMsg;
use ipc_channel::ipc::IpcSender;
use libc::c_void;
use net_traits::image_cache::PendingImageId;
use nonzero::NonZeroUsize;
use nonzero::NonZero;
use script_traits::UntrustedNodeAddress;
use servo_url::ServoUrl;
use std::marker::PhantomData;
use std::sync::atomic::AtomicIsize;
use style::data::ElementData;
@ -78,8 +77,7 @@ pub struct OpaqueStyleAndLayoutData {
// NB: We really store a `StyleAndLayoutData` here, so be careful!
#[ignore_heap_size_of = "TODO(#6910) Box value that should be counted but \
the type lives in layout"]
pub ptr: NonZeroUsize,
pub phantom: PhantomData<*mut StyleData>,
pub ptr: NonZero<*mut StyleData>,
}
#[allow(unsafe_code)]