mirror of
https://github.com/servo/servo.git
synced 2025-08-05 21:50:18 +01:00
cargo fix --edition-idioms
This commit is contained in:
parent
b1fd6237d1
commit
2012be4a8b
203 changed files with 665 additions and 1281 deletions
|
@ -78,14 +78,14 @@ where
|
|||
pub unsafe trait StableTraceObject {
|
||||
/// Returns a stable trace object which address won't change for the whole
|
||||
/// lifetime of the value.
|
||||
fn stable_trace_object(&self) -> *const JSTraceable;
|
||||
fn stable_trace_object(&self) -> *const dyn JSTraceable;
|
||||
}
|
||||
|
||||
unsafe impl<T> StableTraceObject for Dom<T>
|
||||
where
|
||||
T: DomObject,
|
||||
{
|
||||
fn stable_trace_object<'a>(&'a self) -> *const JSTraceable {
|
||||
fn stable_trace_object<'a>(&'a self) -> *const dyn JSTraceable {
|
||||
// The JSTraceable impl for Reflector doesn't actually do anything,
|
||||
// so we need this shenanigan to actually trace the reflector of the
|
||||
// T pointer in Dom<T>.
|
||||
|
@ -198,7 +198,7 @@ where
|
|||
/// See also [*Exact Stack Rooting - Storing a GCPointer on the CStack*]
|
||||
/// (https://developer.mozilla.org/en-US/docs/Mozilla/Projects/SpiderMonkey/Internals/GC/Exact_Stack_Rooting).
|
||||
pub struct RootCollection {
|
||||
roots: UnsafeCell<Vec<*const JSTraceable>>,
|
||||
roots: UnsafeCell<Vec<*const dyn JSTraceable>>,
|
||||
}
|
||||
|
||||
thread_local!(static STACK_ROOTS: Cell<Option<*const RootCollection>> = Cell::new(None));
|
||||
|
@ -228,13 +228,13 @@ impl RootCollection {
|
|||
}
|
||||
|
||||
/// Starts tracking a trace object.
|
||||
unsafe fn root(&self, object: *const JSTraceable) {
|
||||
unsafe fn root(&self, object: *const dyn JSTraceable) {
|
||||
debug_assert!(thread_state::get().is_script());
|
||||
(*self.roots.get()).push(object);
|
||||
}
|
||||
|
||||
/// Stops tracking a trace object, asserting if it isn't found.
|
||||
unsafe fn unroot(&self, object: *const JSTraceable) {
|
||||
unsafe fn unroot(&self, object: *const dyn JSTraceable) {
|
||||
debug_assert!(thread_state::get().is_script());
|
||||
let roots = &mut *self.roots.get();
|
||||
match roots.iter().rposition(|r| *r == object) {
|
||||
|
|
|
@ -375,7 +375,7 @@ unsafe_no_jsmanaged_fields!(usize, u8, u16, u32, u64);
|
|||
unsafe_no_jsmanaged_fields!(isize, i8, i16, i32, i64);
|
||||
unsafe_no_jsmanaged_fields!(Error);
|
||||
unsafe_no_jsmanaged_fields!(ServoUrl, ImmutableOrigin, MutableOrigin);
|
||||
unsafe_no_jsmanaged_fields!(Image, ImageMetadata, ImageCache, PendingImageId);
|
||||
unsafe_no_jsmanaged_fields!(Image, ImageMetadata, dyn ImageCache, PendingImageId);
|
||||
unsafe_no_jsmanaged_fields!(Metadata);
|
||||
unsafe_no_jsmanaged_fields!(NetworkError);
|
||||
unsafe_no_jsmanaged_fields!(Atom, Prefix, LocalName, Namespace, QualName);
|
||||
|
@ -461,7 +461,7 @@ unsafe_no_jsmanaged_fields!(AudioBuffer);
|
|||
unsafe_no_jsmanaged_fields!(AudioContext<Backend>);
|
||||
unsafe_no_jsmanaged_fields!(NodeId);
|
||||
unsafe_no_jsmanaged_fields!(AnalysisEngine, DistanceModel, PanningModel, ParamType);
|
||||
unsafe_no_jsmanaged_fields!(Player<Error = ServoMediaError>);
|
||||
unsafe_no_jsmanaged_fields!(dyn Player<Error = ServoMediaError>);
|
||||
unsafe_no_jsmanaged_fields!(Mutex<MediaFrameRenderer>);
|
||||
unsafe_no_jsmanaged_fields!(RenderApiSender);
|
||||
|
||||
|
@ -497,7 +497,7 @@ where
|
|||
}
|
||||
|
||||
// Safe thanks to the Send bound.
|
||||
unsafe impl JSTraceable for Box<LayoutRPC + Send + 'static> {
|
||||
unsafe impl JSTraceable for Box<dyn LayoutRPC + Send + 'static> {
|
||||
#[inline]
|
||||
unsafe fn trace(&self, _: *mut JSTracer) {
|
||||
// Do nothing
|
||||
|
@ -733,7 +733,7 @@ where
|
|||
|
||||
/// Holds a set of JSTraceables that need to be rooted
|
||||
struct RootedTraceableSet {
|
||||
set: Vec<*const JSTraceable>,
|
||||
set: Vec<*const dyn JSTraceable>,
|
||||
}
|
||||
|
||||
thread_local!(/// TLV Holds a set of JSTraceables that need to be rooted
|
||||
|
@ -744,7 +744,7 @@ impl RootedTraceableSet {
|
|||
RootedTraceableSet { set: vec![] }
|
||||
}
|
||||
|
||||
unsafe fn remove(traceable: *const JSTraceable) {
|
||||
unsafe fn remove(traceable: *const dyn JSTraceable) {
|
||||
ROOTED_TRACEABLES.with(|ref traceables| {
|
||||
let mut traceables = traceables.borrow_mut();
|
||||
let idx = match traceables.set.iter().rposition(|x| *x == traceable) {
|
||||
|
@ -755,7 +755,7 @@ impl RootedTraceableSet {
|
|||
});
|
||||
}
|
||||
|
||||
unsafe fn add(traceable: *const JSTraceable) {
|
||||
unsafe fn add(traceable: *const dyn JSTraceable) {
|
||||
ROOTED_TRACEABLES.with(|ref traceables| {
|
||||
traceables.borrow_mut().set.push(traceable);
|
||||
})
|
||||
|
|
|
@ -269,7 +269,7 @@ impl<T: WeakReferenceable> DerefMut for WeakRefVec<T> {
|
|||
/// An entry of a vector of weak references. Passed to the closure
|
||||
/// given to `WeakRefVec::update`.
|
||||
#[allow_unrooted_interior]
|
||||
pub struct WeakRefEntry<'a, T: WeakReferenceable + 'a> {
|
||||
pub struct WeakRefEntry<'a, T: WeakReferenceable> {
|
||||
vec: &'a mut WeakRefVec<T>,
|
||||
index: &'a mut usize,
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue