aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/websocket.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-12-03 16:10:24 +0530
committerbors-servo <lbergstrom+bors@mozilla.com>2015-12-03 16:10:24 +0530
commit8ae008761f6bf19b7c912cf9e0bf2aa157f32dec (patch)
tree1417569833e67e87712750b83f9deb46aa4afddb /components/script/dom/websocket.rs
parent63762d2b52ee6026216d304c8826bf8b4a5fdd20 (diff)
parent1a8db9a07a0f7118488fb2ff120a92e3524c7b0e (diff)
downloadservo-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/websocket.rs')
-rw-r--r--components/script/dom/websocket.rs5
1 files changed, 3 insertions, 2 deletions
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() {