aboutsummaryrefslogtreecommitdiffstats
path: root/components/script
diff options
context:
space:
mode:
authorMs2ger <ms2ger@gmail.com>2015-06-25 23:03:54 +0200
committerMs2ger <ms2ger@gmail.com>2015-06-25 23:03:54 +0200
commit28086f3c75edefb7c516a409bb9c66ed226dbcd8 (patch)
tree1cbc7af1a2bd2e48add5095c92a82857b651f8b1 /components/script
parentea06bebca9fab485485ce60bd3f464bc64bf1c36 (diff)
downloadservo-28086f3c75edefb7c516a409bb9c66ed226dbcd8.tar.gz
servo-28086f3c75edefb7c516a409bb9c66ed226dbcd8.zip
Use Box::into_raw rather than boxed::into_raw.
The latter is deprecated.
Diffstat (limited to 'components/script')
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py3
-rw-r--r--components/script/dom/bindings/utils.rs3
2 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 2847401e65c..5aa3adecc41 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -2059,7 +2059,7 @@ class CGAbstractMethod(CGThing):
assert(False) # Override me!
def CreateBindingJSObject(descriptor, parent=None):
- create = "let mut raw = boxed::into_raw(object);\nlet _rt = RootedTraceable::new(&*raw);\n"
+ create = "let mut raw = Box::into_raw(object);\nlet _rt = RootedTraceable::new(&*raw);\n"
if descriptor.proxy:
assert not descriptor.isGlobal()
create += """
@@ -5061,7 +5061,6 @@ class CGBindingRoot(CGThing):
'libc',
'util::str::DOMString',
'std::borrow::ToOwned',
- 'std::boxed',
'std::cmp',
'std::iter::repeat',
'std::mem',
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs
index 5a2eb51f2ce..e2db66ac3de 100644
--- a/components/script/dom/bindings/utils.rs
+++ b/components/script/dom/bindings/utils.rs
@@ -21,7 +21,6 @@ use util::str::DOMString;
use libc;
use libc::c_uint;
-use std::boxed;
use std::ffi::CString;
use std::ptr;
use std::cmp::PartialEq;
@@ -387,7 +386,7 @@ pub fn initialize_global(global: *mut JSObject) {
([0 as *mut JSObject; PrototypeList::ID::Count as usize]);
unsafe {
assert!(((*JS_GetClass(global)).flags & JSCLASS_DOM_GLOBAL) != 0);
- let box_ = boxed::into_raw(proto_array);
+ let box_ = Box::into_raw(proto_array);
JS_SetReservedSlot(global,
DOM_PROTOTYPE_SLOT,
PrivateValue(box_ as *const libc::c_void));