From 28086f3c75edefb7c516a409bb9c66ed226dbcd8 Mon Sep 17 00:00:00 2001
From: Ms2ger <ms2ger@gmail.com>
Date: Thu, 25 Jun 2015 23:03:54 +0200
Subject: [PATCH] Use Box::into_raw rather than boxed::into_raw.

The latter is deprecated.
---
 components/gfx/platform/freetype/font_context.rs      | 10 ++++------
 components/net/resource_task.rs                       |  4 ++--
 components/script/dom/bindings/codegen/CodegenRust.py |  3 +--
 components/script/dom/bindings/utils.rs               |  3 +--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/components/gfx/platform/freetype/font_context.rs b/components/gfx/platform/freetype/font_context.rs
index b8b70c2b42e..489edf18505 100644
--- a/components/gfx/platform/freetype/font_context.rs
+++ b/components/gfx/platform/freetype/font_context.rs
@@ -109,20 +109,18 @@ pub struct FontContextHandle {
 
 impl FontContextHandle {
     pub fn new() -> FontContextHandle {
-        let user = box User {
+        let user = Box::into_raw(box User {
             size: 0,
-        };
-        let user: *mut User = ::std::boxed::into_raw(user);
-        let mem = box struct_FT_MemoryRec_ {
+        });
+        let mem = Box::into_raw(box struct_FT_MemoryRec_ {
             user: user as *mut c_void,
             alloc: ft_alloc,
             free: ft_free,
             realloc: ft_realloc,
-        };
+        });
         unsafe {
             let mut ctx: FT_Library = ptr::null_mut();
 
-            let mem = ::std::boxed::into_raw(mem);
             let result = FT_New_Library(mem, &mut ctx);
             if !result.succeeded() { panic!("Unable to initialize FreeType library"); }
 
diff --git a/components/net/resource_task.rs b/components/net/resource_task.rs
index 5b345bb8dcf..10eb26e8bde 100644
--- a/components/net/resource_task.rs
+++ b/components/net/resource_task.rs
@@ -23,7 +23,7 @@ use hyper::header::{ContentType, Header, SetCookie, UserAgent};
 use hyper::mime::{Mime, TopLevel, SubLevel};
 
 use std::borrow::ToOwned;
-use std::boxed::{self, FnBox};
+use std::boxed::FnBox;
 use std::collections::HashMap;
 use std::env;
 use std::fs::File;
@@ -52,8 +52,8 @@ pub fn global_init() {
         Err(_) => return,
     };
 
+    let host_table = Box::into_raw(parse_hostsfile(&lines));
     unsafe {
-        let host_table = boxed::into_raw(parse_hostsfile(&lines));
         HOST_TABLE = Some(host_table);
     }
 }
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));