diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2017-10-14 13:05:28 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2017-10-16 20:19:59 +0200 |
| commit | 99b052d3a6d59ad17ed2bf3d3c54af2bb40d926a (patch) | |
| tree | a137eeeabbd0692fbf0a3cdf1612b1ce13a7f80a | |
| parent | e2fafd2dfc7a1b66fb224c83e15042d8f6d595c0 (diff) | |
| download | servo-99b052d3a6d59ad17ed2bf3d3c54af2bb40d926a.tar.gz servo-99b052d3a6d59ad17ed2bf3d3c54af2bb40d926a.zip | |
Move remaining uses of NonZero to our nonzero crate
| -rw-r--r-- | components/script/dom/bindings/codegen/CodegenRust.py | 1 | ||||
| -rw-r--r-- | components/script/dom/bindings/root.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/bindings/weakref.rs | 2 | ||||
| -rw-r--r-- | components/script/lib.rs | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 084945fad6b..5d4e66f71f4 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -5575,7 +5575,6 @@ def generate_imports(config, cgthings, descriptors, callbacks=None, dictionaries typedefs = [] return CGImports(cgthings, descriptors, callbacks, dictionaries, enums, typedefs, [ - 'core::nonzero::NonZero', 'js', 'js::JSCLASS_GLOBAL_SLOT_COUNT', 'js::JSCLASS_IS_DOMJSCLASS', diff --git a/components/script/dom/bindings/root.rs b/components/script/dom/bindings/root.rs index 5aaa806ceaf..998a2bd2413 100644 --- a/components/script/dom/bindings/root.rs +++ b/components/script/dom/bindings/root.rs @@ -24,7 +24,6 @@ //! originating `DomRoot<T>`. //! -use core::nonzero::NonZero; use dom::bindings::conversions::DerivedFrom; use dom::bindings::inheritance::Castable; use dom::bindings::reflector::{DomObject, Reflector}; @@ -35,6 +34,7 @@ use heapsize::HeapSizeOf; use js::jsapi::{JSObject, JSTracer, Heap}; use js::rust::GCMethods; use mitochondria::OnceCell; +use nonzero::NonZero; use script_layout_interface::TrustedNodeAddress; use std::cell::{Cell, UnsafeCell}; use std::default::Default; diff --git a/components/script/dom/bindings/weakref.rs b/components/script/dom/bindings/weakref.rs index e3cff6175b5..36eac4c4f32 100644 --- a/components/script/dom/bindings/weakref.rs +++ b/components/script/dom/bindings/weakref.rs @@ -11,7 +11,6 @@ //! slot. When all associated `WeakRef` values are dropped, the //! `WeakBox` itself is dropped too. -use core::nonzero::NonZero; use dom::bindings::reflector::DomObject; use dom::bindings::root::DomRoot; use dom::bindings::trace::JSTraceable; @@ -19,6 +18,7 @@ use heapsize::HeapSizeOf; use js::jsapi::{JSTracer, JS_GetReservedSlot, JS_SetReservedSlot}; use js::jsval::PrivateValue; use libc::c_void; +use nonzero::NonZero; use std::cell::{Cell, UnsafeCell}; use std::mem; use std::ops::{Deref, DerefMut, Drop}; diff --git a/components/script/lib.rs b/components/script/lib.rs index 8ea44e68d77..03e278ad26a 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -8,7 +8,6 @@ #![feature(const_ptr_null_mut)] #![feature(core_intrinsics)] #![feature(mpsc_select)] -#![feature(nonzero)] #![feature(on_unimplemented)] #![feature(plugin)] #![feature(proc_macro)] |