Merge pull request #169 from rnestler/add-form-str-impl-for-timeout

Implement FromStr for Timeout

src/timeout.rs

@@ -1,4 +1,15 @@
+use std::{num::ParseIntError, str::FromStr};
+
 /// Describes the timeout of a notification
+/// 
+/// # `FromStr`
+/// You can also parse a `Timeout` from a `&str`.
+/// ```
+/// # use notify_rust::Timeout;
+/// assert_eq!("default".parse(), Ok(Timeout::Default));
+/// assert_eq!("never".parse(), Ok(Timeout::Never));
+/// assert_eq!("42".parse(), Ok(Timeout::Milliseconds(42)));
+/// ```
 #[derive(Debug, Copy, Clone, PartialEq, Eq)]
 pub enum Timeout {
     /// Expires according to server default.
@@ -55,6 +66,18 @@ impl From<Timeout> for i32 {
     }
 }
 
+impl FromStr for Timeout {
+    type Err = ParseIntError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "default" => Ok(Timeout::Default),
+            "never" => Ok(Timeout::Never),
+            milliseconds => Ok(Timeout::Milliseconds(u32::from_str(milliseconds)?)),
+        }
+    }
+}
+
 pub struct TimeoutMessage(Timeout);
 
 impl From<Timeout> for TimeoutMessage {

src/xdg/mod.rs

@@ -302,23 +302,23 @@ pub(crate) fn show_notification(notification: &Notification) -> Result<Notificat
     }
 }
 
-/// Get the currently dsed [`DbusStack`]
+/// Get the currently used [`DbusStack`]
 ///
 /// (zbus only)
 #[cfg(all(feature = "zbus", not(feature = "dbus")))]
 pub fn dbus_stack() -> Option<DbusStack> {
     Some(DbusStack::Zbus)
 }
 
-/// Get the currently dsed [`DbusStack`]
+/// Get the currently used [`DbusStack`]
 ///
 /// (dbus-rs only)
 #[cfg(all(feature = "dbus", not(feature = "zbus")))]
 pub fn dbus_stack() -> Option<DbusStack> {
     Some(DbusStack::Dbus)
 }
 
-/// Get the currently dsed [`DbusStack`]
+/// Get the currently used [`DbusStack`]
 ///
 /// both dbus-rs and zbus, switch via `$ZBUS_NOTIFICATION`
 #[cfg(all(feature = "dbus", feature = "zbus"))]
@@ -330,7 +330,7 @@ pub fn dbus_stack() -> Option<DbusStack> {
     })
 }
 
-/// Get the currently dsed [`DbusStack`]
+/// Get the currently used [`DbusStack`]
 ///
 /// neither zbus nor dbus-rs are configured
 #[cfg(all(not(feature = "dbus"), not(feature = "zbus")))]