Error improvement

Cargo.toml

@@ -17,6 +17,7 @@ hyper-rustls = { version = "0.22.1", optional = true }
 log = "0.4.6"
 pin-project = "1.0.5"
 tokio = { version = "1.2.0", features = ["time"] }
+thiserror = "1.0.23"
 
 [dev-dependencies]
 env_logger = "0.7.1"

examples/tail.rs

@@ -36,7 +36,7 @@ async fn main() -> Result<(), es::Error> {
     Ok(())
 }
 
-fn tail_events(mut client: es::Client<es::HttpsConnector>) -> impl Stream<Item = Result<(), ()>> {
+fn tail_events(client: es::Client<es::HttpsConnector>) -> impl Stream<Item = Result<(), ()>> {
     client
         .stream()
         .map_ok(|event| {

src/client.rs

@@ -121,7 +121,7 @@ impl<C> Client<C> {
     ///
     /// After the first successful connection, the stream will
     /// reconnect for retryable errors.
-    pub fn stream(&mut self) -> EventStream<C>
+    pub fn stream(&self) -> EventStream<C>
     where
         C: Connect + Clone + Send + Sync + 'static,
     {

src/error.rs

@@ -1,19 +1,22 @@
 /// Error type returned from this library's functions.
-#[derive(Debug)]
+#[derive(Debug, thiserror::Error)]
 pub enum Error {
-    /// The HTTP request failed.
+    #[error("HTTP request failed: {0}")]
     HttpRequest(Box<dyn std::error::Error + Send + 'static>),
-    /// An error reading from the HTTP response body.
+    #[error("error reading from the HTTP response body: {0}")]
     HttpStream(Box<dyn std::error::Error + Send + 'static>),
-    /// The HTTP response stream ended unexpectedly (e.g. in the
-    /// middle of an event).
+    /// e.g. in the middle of an event.
+    #[error("HTTP response stream ended unexpectedly")]
     UnexpectedEof,
     /// Encountered a line not conforming to the SSE protocol.
+    #[error("Invalid line encountered")]
     InvalidLine(String),
     /// Encountered an event type that is not a valid UTF-8 byte sequence.
+    #[error("Event type is not valid UTF-8")]
     InvalidEventType(std::str::Utf8Error),
     /// An unexpected failure occurred.
-    Unexpected(Box<dyn std::error::Error + Send + 'static>),
+    #[error("Unexpected failure: {0}")]
+    Unexpected(#[from] Box<dyn std::error::Error + Send + 'static>),
 }
 
 impl PartialEq<Error> for Error {
@@ -46,13 +49,4 @@ impl Error {
     }
 }
 
-impl<E> From<E> for Error
-where
-    E: std::error::Error + Send + 'static,
-{
-    fn from(e: E) -> Error {
-        Error::Unexpected(Box::new(e))
-    }
-}
-
 pub type Result<T> = std::result::Result<T, Error>;