diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-03 16:10:24 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-03 16:10:24 +0530 |
commit | 8ae008761f6bf19b7c912cf9e0bf2aa157f32dec (patch) | |
tree | 1417569833e67e87712750b83f9deb46aa4afddb /components/script/dom | |
parent | 63762d2b52ee6026216d304c8826bf8b4a5fdd20 (diff) | |
parent | 1a8db9a07a0f7118488fb2ff120a92e3524c7b0e (diff) | |
download | servo-8ae008761f6bf19b7c912cf9e0bf2aa157f32dec.tar.gz servo-8ae008761f6bf19b7c912cf9e0bf2aa157f32dec.zip |
Auto merge of #8787 - Jayflux:hotfix/8695, r=mbrubeck
now using external ref_slice instead of the std version fixed #8695
Fixes #8695.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8787)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/node.rs | 2 | ||||
-rw-r--r-- | components/script/dom/websocket.rs | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 1e08cac6083..30aa8e78eea 100644 --- a/components/script/dom/node.rs +++ b/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; diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 6c19ce851a6..d75662c157e 100644 --- a/components/script/dom/websocket.rs +++ b/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() { |