aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-09-25 13:47:37 -0600
committerbors-servo <metajack+bors@gmail.com>2015-09-25 13:47:37 -0600
commitb7c003f1584375ba37006fedd773141a3d32d99c (patch)
treeb613685acee8c897f32446c35fade95dfeffaab5 /components/script/dom
parent8027777e2409705b1d45cdd4c781e499fd5a7f0d (diff)
parent35d7ced89e164e778f9dd29ca5f8dc3a8aca8bdf (diff)
downloadservo-b7c003f1584375ba37006fedd773141a3d32d99c.tar.gz
servo-b7c003f1584375ba37006fedd773141a3d32d99c.zip
Auto merge of #7741 - Wafflespeanut:warning_fix, r=jdm
fixed the deprecated `as_slice` warning... I've put its original implementation from [`core/option.rs`](http://doc.servo.org/src/core/option.rs.html#692) instead of the dear departed `as_slice` <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7741) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/websocket.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs
index 304ea11e05a..279447070d0 100644
--- a/components/script/dom/websocket.rs
+++ b/components/script/dom/websocket.rs
@@ -32,8 +32,8 @@ use script_task::ScriptTaskEventCategory::WebSocketEvent;
use script_task::{CommonScriptMsg, Runnable};
use std::borrow::ToOwned;
use std::cell::{Cell, RefCell};
-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;
@@ -139,7 +139,9 @@ impl WebSocket {
// Step 3: Potentially block access to some ports.
// Step 4.
- let protocols = protocols.as_slice();
+ let protocols: &[DOMString] = protocols
+ .as_ref()
+ .map_or(&[], |ref string| slice::ref_slice(string));
// Step 5.
for (i, protocol) in protocols.iter().enumerate() {
@@ -151,7 +153,6 @@ impl WebSocket {
if protocols[i + 1..].iter().any(|p| p == protocol) {
return Err(Syntax);
-
}
if protocol.chars().any(|c| c < '\u{0021}' || c > '\u{007E}') {