aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoracdenisSK <[email protected]>2017-10-24 18:20:11 +0200
committeracdenisSK <[email protected]>2017-10-24 18:21:32 +0200
commit29b55c098ad47c9aa349092af3fff04349838da3 (patch)
tree0e4bdbec7e9e4b8ea87eb6f3f34a9c92ec897e96 /src
parentFix the version (diff)
downloadserenity-29b55c098ad47c9aa349092af3fff04349838da3.tar.xz
serenity-29b55c098ad47c9aa349092af3fff04349838da3.zip
Remove unwraps
Diffstat (limited to 'src')
-rw-r--r--src/gateway/shard.rs2
-rw-r--r--src/model/user.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gateway/shard.rs b/src/gateway/shard.rs
index 3343adc..0b47acc 100644
--- a/src/gateway/shard.rs
+++ b/src/gateway/shard.rs
@@ -142,7 +142,7 @@ impl Shard {
token: Arc<Mutex<String>>,
shard_info: [u64; 2])
-> Result<Shard> {
- let client = connecting(&*ws_url.lock().unwrap());
+ let client = connecting(&*ws_url.lock());
let current_presence = (None, OnlineStatus::Online);
let heartbeat_instants = (None, None);
diff --git a/src/model/user.rs b/src/model/user.rs
index 1bf69e4..bf247f1 100644
--- a/src/model/user.rs
+++ b/src/model/user.rs
@@ -601,7 +601,7 @@ impl User {
.guilds
.get(&_guild_id)
.map(|g| {
- g.read().unwrap().members.get(&self.id)
+ g.read().members.get(&self.id)
.map(|m| m.roles.contains(&role_id))
.unwrap_or(false)
})