servo: Merge #8787 - now using external ref_slice instead of the std version fixed #8695 (from Jayflux:hotfix/8695); r=mbrubeck

Fixes #8695.

Source-Repo: https://github.com/servo/servo
Source-Revision: 8ae008761f6bf19b7c912cf9e0bf2aa157f32dec

servo/components/script/Cargo.toml

@@ -88,3 +88,4 @@ serde = "0.6"
 caseless = "0.1.0"
 image = "0.5.0"
 url = "0.5"
+ref_slice = "0.1.0"

servo/components/script/dom/node.rs

@@ -51,6 +51,7 @@ use js::jsapi::{JSContext, JSObject, JSRuntime};
 use layout_interface::{LayoutChan, Msg};
 use libc::{self, c_void, uintptr_t};
 use parse::html::parse_html_fragment;
+use ref_slice::ref_slice;
 use script_traits::UntrustedNodeAddress;
 use selectors::matching::matches;
 use selectors::parser::Selector;
@@ -61,7 +62,6 @@ use std::cmp::max;
 use std::default::Default;
 use std::iter::{self, FilterMap, Peekable};
 use std::mem;
-use std::slice::ref_slice;
 use std::sync::Arc;
 use string_cache::{Atom, Namespace, QualName};
 use style::properties::ComputedValues;

servo/components/script/dom/websocket.rs

@@ -27,12 +27,13 @@ use js::jsapi::{JS_GetArrayBufferData, JS_NewArrayBuffer};
 use js::jsval::UndefinedValue;
 use libc::{uint32_t, uint8_t};
 use net_traits::hosts::replace_hosts;
+use ref_slice::ref_slice;
 use script_task::ScriptTaskEventCategory::WebSocketEvent;
 use script_task::{CommonScriptMsg, Runnable};
 use std::borrow::ToOwned;
 use std::cell::Cell;
+use std::ptr;
 use std::sync::{Arc, Mutex};
-use std::{ptr, slice};
 use util::str::DOMString;
 use util::task::spawn_named;
 use websocket::client::receiver::Receiver;
@@ -230,7 +231,7 @@ impl WebSocket {
         // Step 4.
         let protocols: &[DOMString] = protocols
                                       .as_ref()
-                                      .map_or(&[], |ref string| slice::ref_slice(string));
+                                      .map_or(&[], |ref string| ref_slice(string));
 
         // Step 5.
         for (i, protocol) in protocols.iter().enumerate() {

servo/components/script/lib.rs

@@ -20,7 +20,6 @@
 #![feature(nonzero)]
 #![feature(on_unimplemented)]
 #![feature(plugin)]
-#![feature(ref_slice)]
 #![feature(slice_patterns)]
 #![feature(str_utf16)]
 #![feature(unicode)]
@@ -61,6 +60,7 @@ extern crate offscreen_gl_context;
 #[macro_use]
 extern crate profile_traits;
 extern crate rand;
+extern crate ref_slice;
 extern crate rustc_serialize;
 extern crate rustc_unicode;
 extern crate script_traits;

servo/components/servo/Cargo.lock

@@ -1478,6 +1478,11 @@ name = "rc"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ref_slice"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "regex"
 version = "0.1.41"
@@ -1527,6 +1532,7 @@ dependencies = [
  "plugins 0.0.1",
  "profile_traits 0.0.1",
  "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

servo/ports/cef/Cargo.lock

@@ -1403,6 +1403,11 @@ name = "rc"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ref_slice"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "regex"
 version = "0.1.41"
@@ -1452,6 +1457,7 @@ dependencies = [
  "plugins 0.0.1",
  "profile_traits 0.0.1",
  "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",

servo/ports/gonk/Cargo.lock

@@ -1380,6 +1380,11 @@ name = "rc"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "ref_slice"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "regex"
 version = "0.1.41"
@@ -1429,6 +1434,7 @@ dependencies = [
  "plugins 0.0.1",
  "profile_traits 0.0.1",
  "rand 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ref_slice 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc-serialize 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
  "script_traits 0.0.1",
  "selectors 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",