aboutsummaryrefslogtreecommitdiff
path: root/src/cache
diff options
context:
space:
mode:
authorZeyla Hellyer <[email protected]>2017-09-09 08:23:21 -0700
committerZeyla Hellyer <[email protected]>2017-09-09 08:23:21 -0700
commit1c138a357b37e3bd8002109cfb9a8da94a53810e (patch)
tree3256df54f6b31e0422848ea6bcc1d35e58b27eee /src/cache
parent`parent_id` -> `category_id` (diff)
downloadserenity-1c138a357b37e3bd8002109cfb9a8da94a53810e.tar.xz
serenity-1c138a357b37e3bd8002109cfb9a8da94a53810e.zip
Apply rustfmt + fix tests
Diffstat (limited to 'src/cache')
-rw-r--r--src/cache/cache_events_impl.rs12
-rw-r--r--src/cache/mod.rs4
2 files changed, 11 insertions, 5 deletions
diff --git a/src/cache/cache_events_impl.rs b/src/cache/cache_events_impl.rs
index 64dbfde..e5a6f68 100644
--- a/src/cache/cache_events_impl.rs
+++ b/src/cache/cache_events_impl.rs
@@ -113,7 +113,9 @@ impl CacheEventsImpl for super::Cache {
ch.map(Channel::Private)
},
Channel::Category(ref category) => {
- self.categories.insert(category.read().unwrap().id, category.clone()).map(Channel::Category)
+ self.categories
+ .insert(category.read().unwrap().id, category.clone())
+ .map(Channel::Category)
},
}
}
@@ -225,9 +227,11 @@ impl CacheEventsImpl for super::Cache {
.map(|private| private.clone_from(channel));
},
Channel::Category(ref category) => {
- self.categories
- .get_mut(&category.read().unwrap().id)
- .map(|c| c.clone_from(category));
+ self.categories.get_mut(&category.read().unwrap().id).map(
+ |c| {
+ c.clone_from(category)
+ },
+ );
},
}
}
diff --git a/src/cache/mod.rs b/src/cache/mod.rs
index 3a53262..88e4266 100644
--- a/src/cache/mod.rs
+++ b/src/cache/mod.rs
@@ -596,7 +596,9 @@ impl Cache {
}
#[inline]
- pub fn categories<C: Into<ChannelId>>(&self, channel_id: C) -> Option<Arc<RwLock<ChannelCategory>>> {
+ pub fn categories<C: Into<ChannelId>>(&self,
+ channel_id: C)
+ -> Option<Arc<RwLock<ChannelCategory>>> {
self.categories.get(&channel_id.into()).cloned()
}