move [legacy_]query_result.rs to response module

Author: wprzytula

docs/source/migration-guides/0.15-deserialization.md

@@ -159,7 +159,7 @@ Before:
 # extern crate scylla;
 # extern crate futures;
 # use scylla::client::session::LegacySession;
-# use scylla::transport::legacy_query_result::IntoTypedRows;
+# use scylla::response::legacy_query_result::IntoTypedRows;
 # use std::error::Error;
 # use futures::stream::StreamExt;
 # async fn check_only_compiles(session: &LegacySession) -> Result<(), Box<dyn Error>> {

docs/source/queries/result.md

@@ -21,16 +21,16 @@ return a `QueryResult` with rows represented as `Option<Vec<Row>>`.
 
 ## Parsing using convenience methods
 
-By calling [`QueryResult::into_rows_result`](https://docs.rs/scylla/latest/scylla/transport/query_result/struct.QueryResult.html#method.into_rows_result),
-one can obtain  [`QueryRowsResult`](https://docs.rs/scylla/latest/scylla/transport/query_result/struct.QueryRowsResult.html).
+By calling [`QueryResult::into_rows_result`](https://docs.rs/scylla/latest/scylla/response/query_result/struct.QueryResult.html#method.into_rows_result),
+one can obtain  [`QueryRowsResult`](https://docs.rs/scylla/latest/scylla/response/query_result/struct.QueryRowsResult.html).
 `QueryRowsResult` provides convenience methods for parsing rows.
 Here are a few of them:
 * `rows::<RowT>()` - returns the rows parsed as the given type
 * `maybe_first_row::<RowT>()` - returns the first received row or `None` if there are no rows
 * `first_row::<RowT>()` - returns the first received row; fails if there are no rows
 * `single_row::<RowT>()` - same as `first_row`, but fails when there is more than one row
 
-Additionally, [`QueryResult`](https://docs.rs/scylla/latest/scylla/transport/query_result/struct.QueryResult.html) has a method `result_not_rows()`, which ensures that query response was not `rows` and thus helps avoid bugs.
+Additionally, [`QueryResult`](https://docs.rs/scylla/latest/scylla/response/query_result/struct.QueryResult.html) has a method `result_not_rows()`, which ensures that query response was not `rows` and thus helps avoid bugs.
 
 ```rust
 # extern crate scylla;
@@ -59,8 +59,8 @@ session.query_unpaged("INSERT INTO ks.tab (a) VALUES (0)", &[]).await?.result_no
 # Ok(())
 # }
 ```
-For more see [`QueryResult`](https://docs.rs/scylla/latest/scylla/transport/query_result/struct.QueryResult.html)
-and [`QueryRowsResult`](https://docs.rs/scylla/latest/scylla/transport/query_result/struct.QueryRowsResult.html)
+For more see [`QueryResult`](https://docs.rs/scylla/latest/scylla/response/query_result/struct.QueryResult.html)
+and [`QueryRowsResult`](https://docs.rs/scylla/latest/scylla/response/query_result/struct.QueryRowsResult.html)
 
 ### `NULL` values
 `NULL` values will return an error when parsed as a Rust type. 

examples/cqlsh-rs.rs

@@ -7,7 +7,7 @@ use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::frame::response::result::Row;
 use scylla::frame::Compression;
-use scylla::transport::query_result::IntoRowsResultError;
+use scylla::response::query_result::IntoRowsResultError;
 use scylla::QueryResult;
 use std::env;
 

scylla/src/client/pager.rs

@@ -38,9 +38,9 @@ use crate::observability::history::{self, HistoryListener};
 use crate::observability::metrics::Metrics;
 use crate::policies::load_balancing::{self, RoutingInfo};
 use crate::policies::retry::{QueryInfo, RetryDecision, RetrySession};
+use crate::response::query_result::ColumnSpecs;
 use crate::response::{NonErrorQueryResponse, QueryResponse};
 use crate::statement::{prepared_statement::PreparedStatement, query::Query};
-use crate::transport::query_result::ColumnSpecs;
 use tracing::{trace, trace_span, warn, Instrument};
 use uuid::Uuid;
 

scylla/src/client/session.rs

@@ -32,12 +32,12 @@ use crate::policies::retry::{QueryInfo, RetryDecision, RetrySession};
 use crate::policies::speculative_execution;
 use crate::prepared_statement::PreparedStatement;
 use crate::query::Query;
+use crate::response::query_result::{MaybeFirstRowError, QueryResult, RowsError};
 use crate::response::{NonErrorQueryResponse, QueryResponse};
 use crate::routing::partitioner::PartitionerName;
 use crate::routing::Shard;
 use crate::statement::StatementConfig;
 use crate::statement::{Consistency, PageSize, PagingState, PagingStateResponse};
-use crate::transport::query_result::{MaybeFirstRowError, QueryResult, RowsError};
 #[allow(deprecated)]
 use crate::LegacyQueryResult;
 use arc_swap::ArcSwapOption;
@@ -63,7 +63,7 @@ use uuid::Uuid;
 // This re-export is to preserve backward compatibility.
 // Those items are no longer here not to clutter session.rs with legacy things.
 #[allow(deprecated)]
-pub use crate::transport::legacy_query_result::{IntoTypedRows, TypedRowIter};
+pub use crate::response::legacy_query_result::{IntoTypedRows, TypedRowIter};
 
 mod sealed {
     // This is a sealed trait - its whole purpose is to be unnameable.

scylla/src/client/session_test.rs

@@ -36,7 +36,7 @@ use std::sync::Arc;
 use tokio::net::TcpListener;
 use uuid::Uuid;
 
-use crate::transport::query_result::QueryRowsResult;
+use crate::response::query_result::QueryRowsResult;
 
 #[tokio::test]
 async fn test_connection_failure() {

scylla/src/errors.rs

@@ -38,8 +38,8 @@ use crate::{authentication::AuthError, frame::response};
 #[allow(deprecated)]
 use crate::client::pager::NextRowError;
 #[allow(deprecated)]
-use crate::transport::legacy_query_result::IntoLegacyQueryResultError;
-use crate::transport::query_result::{IntoRowsResultError, SingleRowError};
+use crate::response::legacy_query_result::IntoLegacyQueryResultError;
+use crate::response::query_result::{IntoRowsResultError, SingleRowError};
 
 /// Error that occurred during query execution
 #[derive(Error, Debug, Clone)]
@@ -115,8 +115,8 @@ pub enum QueryError {
     #[error("An error occurred during async iteration over rows of result: {0}")]
     NextRowError(#[from] NextRowError),
 
-    /// Failed to convert [`QueryResult`][crate::transport::query_result::QueryResult]
-    /// into [`LegacyQueryResult`][crate::transport::legacy_query_result::LegacyQueryResult].
+    /// Failed to convert [`QueryResult`][crate::response::query_result::QueryResult]
+    /// into [`LegacyQueryResult`][crate::response::legacy_query_result::LegacyQueryResult].
     #[deprecated(
         since = "0.15.1",
         note = "Legacy deserialization API is inefficient and is going to be removed soon"
@@ -294,8 +294,8 @@ pub enum NewSessionError {
     #[error("An error occurred during async iteration over rows of result: {0}")]
     NextRowError(#[from] NextRowError),
 
-    /// Failed to convert [`QueryResult`][crate::transport::query_result::QueryResult]
-    /// into [`LegacyQueryResult`][crate::transport::legacy_query_result::LegacyQueryResult].
+    /// Failed to convert [`QueryResult`][crate::response::query_result::QueryResult]
+    /// into [`LegacyQueryResult`][crate::response::legacy_query_result::LegacyQueryResult].
     #[deprecated(
         since = "0.15.1",
         note = "Legacy deserialization API is inefficient and is going to be removed soon"

scylla/src/lib.rs

@@ -280,5 +280,5 @@ pub use statement::query;
 pub use frame::response::cql_to_rust::{self, FromRow};
 
 #[allow(deprecated)]
-pub use transport::legacy_query_result::LegacyQueryResult;
-pub use transport::query_result::{QueryResult, QueryRowsResult};
+pub use response::legacy_query_result::LegacyQueryResult;
+pub use response::query_result::{QueryResult, QueryRowsResult};

scylla/src/network/connection.rs

@@ -23,12 +23,12 @@ use crate::frame::{
 };
 use crate::policies::address_translator::AddressTranslator;
 use crate::query::Query;
+use crate::response::query_result::QueryResult;
 use crate::response::{NonErrorAuthResponse, NonErrorStartupResponse, QueryResponse};
 use crate::routing::locator::tablets::{RawTablet, TabletParsingError};
 use crate::routing::{Shard, ShardInfo, Sharder};
 use crate::statement::prepared_statement::PreparedStatement;
 use crate::statement::{Consistency, PageSize, PagingState, PagingStateResponse};
-use crate::transport::query_result::QueryResult;
 use bytes::Bytes;
 use futures::{future::RemoteHandle, FutureExt};
 use scylla_cql::frame::frame_errors::CqlResponseParseError;

scylla/src/transport/legacy_query_result.rs renamed to scylla/src/response/legacy_query_result.rs

@@ -192,7 +192,7 @@ impl LegacyQueryResult {
     }
 }
 
-/// An error that occurred during [`QueryResult`](crate::transport::query_result::QueryResult)
+/// An error that occurred during [`QueryResult`](crate::response::query_result::QueryResult)
 /// to [`LegacyQueryResult`] conversion.
 #[deprecated(
     since = "0.15.1",