errors: rename variant ProtocolErrorTyped -> ProtocolError

scylladb · Oct 2, 2024 · 92311fc · 92311fc
1 parent 635fde5
commit 92311fc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/scylla/src/transport/errors.rs b/scylla/src/transport/errors.rs
@@ -72,7 +72,7 @@ pub enum QueryError {
 
     /// Protocol error.
     #[error("Protocol error: {0}")]
-    ProtocolErrorTyped(#[from] ProtocolError),
+    ProtocolError(#[from] ProtocolError),
 
     /// Timeout error has occurred, function didn't complete in time.
     #[error("Timeout Error")]
@@ -147,7 +147,7 @@ impl From<QueryError> for NewSessionError {
             QueryError::BodyExtensionsParseError(e) => NewSessionError::BodyExtensionsParseError(e),
             QueryError::MetadataError(e) => NewSessionError::MetadataError(e),
             QueryError::ConnectionPoolError(e) => NewSessionError::ConnectionPoolError(e),
-            QueryError::ProtocolErrorTyped(e) => NewSessionError::ProtocolErrorTyped(e),
+            QueryError::ProtocolError(e) => NewSessionError::ProtocolError(e),
             QueryError::TimeoutError => NewSessionError::TimeoutError,
             QueryError::BrokenConnection(e) => NewSessionError::BrokenConnection(e),
             QueryError::UnableToAllocStreamId => NewSessionError::UnableToAllocStreamId,
@@ -215,7 +215,7 @@ pub enum NewSessionError {
 
     /// Protocol error.
     #[error("Protocol error: {0}")]
-    ProtocolErrorTyped(#[from] ProtocolError),
+    ProtocolError(#[from] ProtocolError),
 
     /// Timeout error has occurred, couldn't connect to node in time.
     #[error("Timeout Error")]

diff --git a/scylla/src/transport/load_balancing/default.rs b/scylla/src/transport/load_balancing/default.rs
@@ -2857,7 +2857,7 @@ mod latency_awareness {
                 | QueryError::CqlErrorParseError(_)
                 | QueryError::BodyExtensionsParseError(_)
                 | QueryError::MetadataError(_)
-                | QueryError::ProtocolErrorTyped(_)
+                | QueryError::ProtocolError(_)
                 | QueryError::TimeoutError
                 | QueryError::RequestTimeout(_) => true,
             }

diff --git a/scylla/src/transport/speculative_execution.rs b/scylla/src/transport/speculative_execution.rs
@@ -92,7 +92,7 @@ fn can_be_ignored<ResT>(result: &Result<ResT, QueryError>) -> bool {
     }
 }
 
-const EMPTY_PLAN_ERROR: QueryError = QueryError::ProtocolErrorTyped(ProtocolError::EmptyPlan);
+const EMPTY_PLAN_ERROR: QueryError = QueryError::ProtocolError(ProtocolError::EmptyPlan);
 
 pub(crate) async fn execute<QueryFut, ResT>(
     policy: &dyn SpeculativeExecutionPolicy,