From ffd7625a176c6b0fe2cff3d8ebf95e6d9cc2c7c0 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte@element.io>
Date: Mon, 21 Mar 2022 19:36:27 +0100
Subject: [PATCH] api: Rename FromHttpResponseError::{Http => Server}

---
 crates/ruma-common/src/api/error.rs                  | 6 +++---
 crates/ruma-common/tests/api/manual_endpoint_impl.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/crates/ruma-common/src/api/error.rs b/crates/ruma-common/src/api/error.rs
index 55534894..41bb7788 100644
--- a/crates/ruma-common/src/api/error.rs
+++ b/crates/ruma-common/src/api/error.rs
@@ -131,21 +131,21 @@ pub enum FromHttpResponseError<E> {
     Deserialization(DeserializationError),
 
     /// The server returned a non-success status
-    Http(ServerError<E>),
+    Server(ServerError<E>),
 }
 
 impl<E: fmt::Display> fmt::Display for FromHttpResponseError<E> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
             Self::Deserialization(err) => write!(f, "deserialization failed: {}", err),
-            Self::Http(err) => write!(f, "the server returned an error: {}", err),
+            Self::Server(err) => write!(f, "the server returned an error: {}", err),
         }
     }
 }
 
 impl<E> From<ServerError<E>> for FromHttpResponseError<E> {
     fn from(err: ServerError<E>) -> Self {
-        Self::Http(err)
+        Self::Server(err)
     }
 }
 
diff --git a/crates/ruma-common/tests/api/manual_endpoint_impl.rs b/crates/ruma-common/tests/api/manual_endpoint_impl.rs
index 026a5758..0bead785 100644
--- a/crates/ruma-common/tests/api/manual_endpoint_impl.rs
+++ b/crates/ruma-common/tests/api/manual_endpoint_impl.rs
@@ -120,7 +120,7 @@ impl IncomingResponse for Response {
         if http_response.status().as_u16() < 400 {
             Ok(Response)
         } else {
-            Err(FromHttpResponseError::Http(ServerError::Known(
+            Err(FromHttpResponseError::Server(ServerError::Known(
                 <MatrixError as EndpointError>::try_from_http_response(http_response)?,
             )))
         }