aboutsummaryrefslogtreecommitdiffstats
path: root/mumd/src/state
diff options
context:
space:
mode:
authorGustav Sörnäs <gustav@sornas.net>2021-06-06 23:26:24 +0200
committerGustav Sörnäs <gustav@sornas.net>2021-06-06 23:26:24 +0200
commitbe76c2aa51733a0cf495e92659fbcbe527f41149 (patch)
tree617fb1caa999c076a45233b4bedea6a78192db25 /mumd/src/state
parent7fc5a1a36404ee4cbc09d20c955e6edd3d2ac523 (diff)
downloadmum-be76c2aa51733a0cf495e92659fbcbe527f41149.tar.gz
cargo fmt
Diffstat (limited to 'mumd/src/state')
-rw-r--r--mumd/src/state/channel.rs5
-rw-r--r--mumd/src/state/server.rs11
2 files changed, 9 insertions, 7 deletions
diff --git a/mumd/src/state/channel.rs b/mumd/src/state/channel.rs
index f58ed15..6995e1e 100644
--- a/mumd/src/state/channel.rs
+++ b/mumd/src/state/channel.rs
@@ -157,10 +157,7 @@ pub fn into_channel(
let mut proto_tree = ProtoTree {
channel: Some(channels.get(&0).unwrap()),
children: HashMap::new(),
- users: channel_lookup
- .get(&0)
- .cloned()
- .unwrap_or_default(),
+ users: channel_lookup.get(&0).cloned().unwrap_or_default(),
};
for (walk, channel) in walks {
diff --git a/mumd/src/state/server.rs b/mumd/src/state/server.rs
index 78a10b9..869940a 100644
--- a/mumd/src/state/server.rs
+++ b/mumd/src/state/server.rs
@@ -103,15 +103,20 @@ impl Server {
/// server.channels.insert(0, channel.clone);
/// assert_eq!(server.channel_name("Foobar"), Ok((0, &channel)));
/// ```
- pub fn channel_name(&self, channel_name: &str) -> Result<(u32, &Channel), ChannelIdentifierError> {
- let matches = self.channels
+ pub fn channel_name(
+ &self,
+ channel_name: &str,
+ ) -> Result<(u32, &Channel), ChannelIdentifierError> {
+ let matches = self
+ .channels
.iter()
.map(|e| ((*e.0, e.1), e.1.path(&self.channels)))
.filter(|e| e.1.ends_with(channel_name))
.collect::<Vec<_>>();
Ok(match matches.len() {
0 => {
- let soft_matches = self.channels
+ let soft_matches = self
+ .channels
.iter()
.map(|e| ((*e.0, e.1), e.1.path(&self.channels).to_lowercase()))
.filter(|e| e.1.ends_with(&channel_name.to_lowercase()))