Improve ergonomics of the new trait

Author: andyblarblar

Cargo.toml

@@ -33,7 +33,7 @@ sec1_decode = "^0.1.0"
 base64 = "^0.13"
 chrono = "^0.4"
 log = "^0.4"
-async-trait = "0.1.73"
+async-trait = "^0.1"
 
 [dev-dependencies]
 argparse = "^0.2"

src/clients/hyper_client.rs

@@ -1,5 +1,4 @@
 use async_trait::async_trait;
-use std::convert::Infallible;
 
 use http::header::{CONTENT_LENGTH, RETRY_AFTER};
 use hyper::{body::HttpBody, client::HttpConnector, Body, Client, Request as HttpRequest};
@@ -22,22 +21,21 @@ pub struct HyperWebPushClient {
 
 impl Default for HyperWebPushClient {
     fn default() -> Self {
-        Self::new().unwrap()
+        Self::new()
     }
 }
 
-#[async_trait]
-impl WebPushClient for HyperWebPushClient {
-    type CreationError = Infallible;
-
+impl HyperWebPushClient {
     /// Creates a new client.
-    fn new() -> Result<Self, Self::CreationError> {
-        //This method can never fail, but returns error to match API of the isahc client.
-        Ok(Self {
+    pub fn new() -> Self {
+        Self {
             client: Client::builder().build(HttpsConnector::new()),
-        })
+        }
     }
+}
 
+#[async_trait]
+impl WebPushClient for HyperWebPushClient {
     /// Sends a notification. Never times out.
     async fn send(&self, message: WebPushMessage) -> Result<(), WebPushError> {
         trace!("Message: {:?}", message);

src/clients/isahc_client.rs

@@ -26,17 +26,17 @@ impl Default for IsahcWebPushClient {
     }
 }
 
-#[async_trait]
-impl WebPushClient for IsahcWebPushClient {
-    type CreationError = WebPushError;
-
+impl IsahcWebPushClient {
     /// Creates a new client. Can fail under resource depletion.
-    fn new() -> Result<Self, Self::CreationError> {
+    pub fn new() -> Result<Self, WebPushError> {
         Ok(Self {
             client: HttpClient::new()?,
         })
     }
+}
 
+#[async_trait]
+impl WebPushClient for IsahcWebPushClient {
     /// Sends a notification. Never times out.
     async fn send(&self, message: WebPushMessage) -> Result<(), WebPushError> {
         trace!("Message: {:?}", message);

src/clients/mod.rs

@@ -17,16 +17,7 @@ pub mod isahc_client;
 /// An async client for sending the notification payload.
 /// Other features, such as thread safety, may vary by implementation.
 #[async_trait]
-pub trait WebPushClient
-where
-    Self: Sized,
-{
-    /// Errors that can occur when creating a client.
-    type CreationError;
-
-    /// Creates a new client.
-    fn new() -> Result<Self, Self::CreationError>;
-
+pub trait WebPushClient {
     /// Sends a notification. Never times out.
     async fn send(&self, message: WebPushMessage) -> Result<(), WebPushError>;
 }

src/error.rs

@@ -75,7 +75,7 @@ impl From<hyper::Error> for WebPushError {
     }
 }
 
-#[cfg(not(feature = "hyper-client"))]
+#[cfg(feature = "isahc-client")]
 impl From<isahc::Error> for WebPushError {
     fn from(_: isahc::Error) -> Self {
         Self::Unspecified