cargo fmt

4 files changed, 37 insertions, 26 deletions

diff --git a/src/agenda.rs b/src/agenda.rs
index 8ed1840..8f71c87 100644
--- a/src/agenda.rs
+++ b/src/agenda.rs
@@ -43,10 +43,14 @@ impl fmt::Display for Agenda {
             .map(|p| p.to_string())
             .collect::<Vec<_>>()
             .join("\n");
-        write!(f, "{}", match s.as_str() {
-            "" => "Empty agenda",
-            _ => &s
-        })
+        write!(
+            f,
+            "{}",
+            match s.as_str() {
+                "" => "Empty agenda",
+                _ => &s,
+            }
+        )
     }
 }
 
diff --git a/src/discord.rs b/src/discord.rs
index 438f0ed..40c30ac 100644
--- a/src/discord.rs
+++ b/src/discord.rs
@@ -175,13 +175,17 @@ async fn handle_reminders(
                     client
                         .lock()
                         .unwrap()
-                        .send_message(channel,
-                                      &format!("Meeting in one hour!\n{}",
-                                              agenda::read_agenda().to_string()),
-                                      "",
-                                      false)
+                        .send_message(
+                            channel,
+                            &format!(
+                                "Meeting in one hour!\n{}",
+                                agenda::read_agenda().to_string()
+                            ),
+                            "",
+                            false,
+                        )
                         .unwrap();
-                },
+                }
                 ReminderType::Void => {}
             }
         }
diff --git a/src/reminder.rs b/src/reminder.rs
index 20e8fb8..7b36b2d 100644
--- a/src/reminder.rs
+++ b/src/reminder.rs
@@ -8,7 +8,7 @@ pub enum ReminderType {
     // Different types of reminders are possible.
     // e.g. different reminders for the day before and one hour before.
     Void,
-    OneHour,  //TODO struct instead
+    OneHour, //TODO struct instead
 }
 
 #[derive(Debug, Serialize, Deserialize)]
@@ -45,8 +45,8 @@ pub async fn handle(sender: watch::Sender<ReminderType>) {
                     sender.broadcast(ReminderType::OneHour).unwrap();
                     reminder.last_fire = now;
                 }
-            },
-            _ => {},
+            }
+            _ => {}
         }
     }
     reminders.write();
@@ -57,10 +57,8 @@ pub async fn handle(sender: watch::Sender<ReminderType>) {
 }
 
 fn read_reminders() -> Reminders {
-    serde_json::from_str(
-        &fs::read_to_string("reminders.json").expect("Can't read reminders.json")
-    )
-    .expect("Error parsing reminders.json")
+    serde_json::from_str(&fs::read_to_string("reminders.json").expect("Can't read reminders.json"))
+        .expect("Error parsing reminders.json")
 }
 
 fn in_remind_zone(dt: DateTime<Local>, meeting: DateTime<Local>) -> bool {
@@ -77,16 +75,14 @@ fn next_meeting() -> DateTime<Local> {
         Weekday::Thu => {
             // same day as meeting.
             // next week if meeting has occured.
-            let date_delta = Duration::weeks(
-                if now.time() < meeting_time { 0 } else { 1 }
-            );
+            let date_delta = Duration::weeks(if now.time() < meeting_time { 0 } else { 1 });
             (now.date() + date_delta).and_time(meeting_time).unwrap()
-        },
+        }
         _ => {
             let dow_index: i64 = now.date().weekday().num_days_from_monday().into();
             let date_delta = Duration::days((3 - dow_index).rem_euclid(7));
             (now.date() + date_delta).and_time(meeting_time).unwrap()
-        },
+        }
     };
     assert!(meeting.weekday() == Weekday::Thu);
     meeting
diff --git a/src/slack.rs b/src/slack.rs
index 1481cf1..2a4c155 100644
--- a/src/slack.rs
+++ b/src/slack.rs
@@ -138,7 +138,7 @@ impl slack::EventHandler for Handler {
                                                         timestamp: Some(msg.ts.unwrap()),
                                                     },
                                                 )
-                                                    .compat(),
+                                                .compat(),
                                             )
                                             .unwrap();
                                     }
@@ -189,7 +189,11 @@ pub async fn handle(
     let slack_sender = client.sender().clone();
 
     let (_, _, _) = join!(
-        spawn(receive_from_discord(receiver, slack_sender.clone(), channel.clone())),
+        spawn(receive_from_discord(
+            receiver,
+            slack_sender.clone(),
+            channel.clone()
+        )),
         spawn(handle_reminders(reminder, slack_sender, channel)),
         spawn_blocking(move || {
             match client.run(&mut handler) {
@@ -229,9 +233,12 @@ async fn handle_reminders(
                 ReminderType::OneHour => {
                     sender.send_typing(&channel).unwrap();
                     sender
-                        .send_message(&channel, &format!("Meeting in one hour!\n{}", agenda::read_agenda()))
+                        .send_message(
+                            &channel,
+                            &format!("Meeting in one hour!\n{}", agenda::read_agenda()),
+                        )
                         .unwrap();
-                },
+                }
                 ReminderType::Void => {}
             }
         }