diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-07 05:59:57 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-07 05:59:57 +0530 |
| commit | 28ecb0bba3fa395ed56bb2448a21e02c3ff88c8b (patch) | |
| tree | 715c25be6722850273c5148a57b25c0e7bb26c33 /components/script/dom/websocket.rs | |
| parent | 2f52a168caa28fcbdcd84e31f093a866ac12955e (diff) | |
| parent | 2be49404be8885d97735792c2833d4e8b1cb007f (diff) | |
| download | servo-28ecb0bba3fa395ed56bb2448a21e02c3ff88c8b.tar.gz servo-28ecb0bba3fa395ed56bb2448a21e02c3ff88c8b.zip | |
Auto merge of #9543 - alopatindev:enums_constructors_codingstyle_fix, r=KiChjang
Fix #9508: Beautify our union enums constructors
Solves #9508
@jdm Please review. Thanks!
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9543)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/websocket.rs')
| -rw-r--r-- | components/script/dom/websocket.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index c8544698ecb..e3f6de6b49a 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull; use dom::bindings::codegen::Bindings::LocationBinding::LocationMethods; use dom::bindings::codegen::Bindings::WebSocketBinding; use dom::bindings::codegen::Bindings::WebSocketBinding::{BinaryType, WebSocketMethods}; -use dom::bindings::codegen::UnionTypes::StringOrStringSequence::{self, eString, eStringSequence}; +use dom::bindings::codegen::UnionTypes::StringOrStringSequence; use dom::bindings::conversions::{ToJSValConvertible}; use dom::bindings::error::{Error, Fallible}; use dom::bindings::global::GlobalRef; @@ -210,8 +210,8 @@ impl WebSocket { // Step 4. let protocols = match protocols { - Some(eString(string)) => vec![String::from(string)], - Some(eStringSequence(sequence)) => { + Some(StringOrStringSequence::String(string)) => vec![String::from(string)], + Some(StringOrStringSequence::StringSequence(sequence)) => { sequence.into_iter().map(String::from).collect() }, _ => Vec::new(), |