Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove usage of unstable features const_ptr_null and const_ptr_null_mut

Browse source
This commit is contained in:
Simon Sapin 2017-10-14 17:57:19 +02:00
parent 3bb76a5be5
commit 5a5b7d7f39
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/interface.rs
View file

@ -134,8 +134,8 @@ impl NonCallbackInterfaceObjectClass {
name: b"Function\0" as *const _ as *const libc::c_char, name: b"Function\0" as *const _ as *const libc::c_char,
flags: 0, flags: 0,
cOps: &constructor_behavior.0, cOps: &constructor_behavior.0,
spec: ptr::null(), spec: 0 as *const _,
ext: ptr::null(), ext: 0 as *const _,
oOps: &OBJECT_OPS, oOps: &OBJECT_OPS,
}, },
proto_id: proto_id, proto_id: proto_id,

5
components/script/dom/bindings/namespace.rs
View file

@ -8,7 +8,6 @@ use dom::bindings::guard::Guard;
use dom::bindings::interface::{create_object, define_on_global_object}; use dom::bindings::interface::{create_object, define_on_global_object};
use js::jsapi::{HandleObject, JSClass, JSContext, JSFunctionSpec, MutableHandleObject}; use js::jsapi::{HandleObject, JSClass, JSContext, JSFunctionSpec, MutableHandleObject};
use libc; use libc;
use std::ptr;
/// The class of a namespace object. /// The class of a namespace object.
#[derive(Clone, Copy)] #[derive(Clone, Copy)]
@ -22,8 +21,8 @@ impl NamespaceObjectClass {
NamespaceObjectClass(JSClass { NamespaceObjectClass(JSClass {
name: name as *const _ as *const libc::c_char, name: name as *const _ as *const libc::c_char,
flags: 0, flags: 0,
cOps: ptr::null_mut(), cOps: 0 as *mut _,
reserved: [ptr::null_mut(); 3], reserved: [0 as *mut _; 3],
}) })
} }
} }

2
components/script/lib.rs
View file

@ -4,8 +4,6 @@
#![feature(conservative_impl_trait)] #![feature(conservative_impl_trait)]
#![feature(const_fn)] #![feature(const_fn)]
#![feature(const_ptr_null)]
#![feature(const_ptr_null_mut)]
#![feature(core_intrinsics)] #![feature(core_intrinsics)]
#![feature(mpsc_select)] #![feature(mpsc_select)]
#![feature(on_unimplemented)] #![feature(on_unimplemented)]