Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

web-sys services conversion #827

Merged
merged 11 commits into from
Jan 15, 2020
Merged

web-sys services conversion #827

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
939d2ac
Convert `console`.
daxpedda Dec 27, 2019
626cf9b
Finish services.
daxpedda Dec 31, 2019
c8ac5c8
Some polish.
daxpedda Dec 31, 2019
45fda39
Fix `ArrayBuffer` to `Uint8Array` conversions.
daxpedda Jan 1, 2020
fd2df8b
Fix aborting fetch leading to error and some polish.
daxpedda Jan 3, 2020
8d49f0b
Replaced some `unwrap`s with `expect`s.
daxpedda Jan 9, 2020
84064d1
Use `cfg_if` and `cfg_match` and do some polish.
daxpedda Jan 9, 2020
74825a3
Proper scoping.
daxpedda Jan 9, 2020
231a025
Some fixes.
daxpedda Jan 12, 2020
f4c6e1d
Move fetch and reader services to different PR.
daxpedda Jan 12, 2020
7524929
Revert split.
daxpedda Jan 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/services/storage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::fmt;
#[cfg(feature = "std_web")]
use stdweb::web::{window, Storage};
#[cfg(feature = "web_sys")]
use web_sys::Storage;
use ::{wasm_bindgen::JsValue, web_sys::Storage};

/// Represents errors of a storage.
#[derive(Debug, Fail)]
Expand Down Expand Up @@ -50,7 +50,9 @@ impl StorageService {
}
};
#[cfg(feature = "web_sys")]
let storage = storage.unwrap().unwrap();
let storage = storage
.and_then(|storage| storage.ok_or(JsValue::NULL))
.expect("failed to aquire storage");
daxpedda marked this conversation as resolved.
Show resolved Hide resolved
StorageService { storage }
}

Expand Down
2 changes: 1 addition & 1 deletion src/services/websocket.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl WebSocketService {
return Err("Failed to created websocket with given URL");
}

let ws = ws.unwrap();
let ws = ws.expect("failed to build websocket");
daxpedda marked this conversation as resolved.
Show resolved Hide resolved
#[cfg(feature = "std_web")]
ws.set_binary_type(SocketBinaryType::ArrayBuffer);
#[cfg(feature = "web_sys")]
Expand Down