diff options
author | Jason Williams <willij87@mc-s083267.local> | 2015-12-02 23:45:02 +0000 |
---|---|---|
committer | Jason Williams <willij87@mc-s083267.local> | 2015-12-03 07:32:07 +0000 |
commit | 1a8db9a07a0f7118488fb2ff120a92e3524c7b0e (patch) | |
tree | 315944f41af84002642196494d37b33a61dfe191 /components/script/dom | |
parent | a8cbc2864367da09fb31fb5f984a7b2d31b90b93 (diff) | |
download | servo-1a8db9a07a0f7118488fb2ff120a92e3524c7b0e.tar.gz servo-1a8db9a07a0f7118488fb2ff120a92e3524c7b0e.zip |
now using external ref_slice instead of the std version
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 f2060566877..0ab4bb2dd6b 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; @@ -212,7 +213,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() { |