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

Move remaining uses of NonZero to our nonzero crate

Browse source
This commit is contained in:
Simon Sapin 2017-10-14 13:05:28 +02:00
parent e2fafd2dfc
commit 99b052d3a6
4 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -5575,7 +5575,6 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries
typedefs = [] typedefs = []
return CGImports(cgthings, descriptors, callbacks, dictionaries, enums, typedefs, [ return CGImports(cgthings, descriptors, callbacks, dictionaries, enums, typedefs, [
'core::nonzero::NonZero',
'js', 'js',
'js::JSCLASS_GLOBAL_SLOT_COUNT', 'js::JSCLASS_GLOBAL_SLOT_COUNT',
'js::JSCLASS_IS_DOMJSCLASS', 'js::JSCLASS_IS_DOMJSCLASS',

2
components/script/dom/bindings/root.rs
View file

@ -24,7 +24,6 @@
//! originating `DomRoot<T>`. //! originating `DomRoot<T>`.
//! //!
use core::nonzero::NonZero;
use dom::bindings::conversions::DerivedFrom; use dom::bindings::conversions::DerivedFrom;
use dom::bindings::inheritance::Castable; use dom::bindings::inheritance::Castable;
use dom::bindings::reflector::{DomObject, Reflector}; use dom::bindings::reflector::{DomObject, Reflector};
@ -35,6 +34,7 @@ use heapsize::HeapSizeOf;
use js::jsapi::{JSObject, JSTracer, Heap}; use js::jsapi::{JSObject, JSTracer, Heap};
use js::rust::GCMethods; use js::rust::GCMethods;
use mitochondria::OnceCell; use mitochondria::OnceCell;
use nonzero::NonZero;
use script_layout_interface::TrustedNodeAddress; use script_layout_interface::TrustedNodeAddress;
use std::cell::{Cell, UnsafeCell}; use std::cell::{Cell, UnsafeCell};
use std::default::Default; use std::default::Default;

2
components/script/dom/bindings/weakref.rs
View file

@ -11,7 +11,6 @@
//! slot. When all associated `WeakRef` values are dropped, the //! slot. When all associated `WeakRef` values are dropped, the
//! `WeakBox` itself is dropped too. //! `WeakBox` itself is dropped too.
use core::nonzero::NonZero;
use dom::bindings::reflector::DomObject; use dom::bindings::reflector::DomObject;
use dom::bindings::root::DomRoot; use dom::bindings::root::DomRoot;
use dom::bindings::trace::JSTraceable; use dom::bindings::trace::JSTraceable;
@ -19,6 +18,7 @@ use heapsize::HeapSizeOf;
use js::jsapi::{JSTracer, JS_GetReservedSlot, JS_SetReservedSlot}; use js::jsapi::{JSTracer, JS_GetReservedSlot, JS_SetReservedSlot};
use js::jsval::PrivateValue; use js::jsval::PrivateValue;
use libc::c_void; use libc::c_void;
use nonzero::NonZero;
use std::cell::{Cell, UnsafeCell}; use std::cell::{Cell, UnsafeCell};
use std::mem; use std::mem;
use std::ops::{Deref, DerefMut, Drop}; use std::ops::{Deref, DerefMut, Drop};

1
components/script/lib.rs
View file

@ -8,7 +8,6 @@
#![feature(const_ptr_null_mut)] #![feature(const_ptr_null_mut)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(mpsc_select)] #![feature(mpsc_select)]
#![feature(nonzero)]
#![feature(on_unimplemented)] #![feature(on_unimplemented)]
#![feature(plugin)] #![feature(plugin)]
#![feature(proc_macro)] #![feature(proc_macro)]