lib: remove [Legacy]QueryResult reexport

Author: wprzytula

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

@@ -273,7 +273,8 @@ In addition to that, it is possible to convert a `QueryResult` to `LegacyQueryRe
 
 ```rust
 # extern crate scylla;
-# use scylla::{QueryResult, LegacyQueryResult};
+# use scylla::response::query_result::QueryResult;
+# use scylla::response::legacy_query_result::LegacyQueryResult;
 # use std::error::Error;
 # async fn check_only_compiles(result: QueryResult) -> Result<(), Box<dyn Error>> {
 let result: QueryResult = result;

docs/source/tracing/basic.md

@@ -11,7 +11,7 @@ return a `QueryResult` which contains a `tracing_id` if tracing was enabled.
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
 use scylla::query::Query;
-use scylla::QueryResult;
+use scylla::response::query_result::QueryResult;
 use scylla::observability::tracing::TracingInfo;
 use uuid::Uuid;
 
@@ -39,7 +39,7 @@ if let Some(id) = tracing_id {
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
 use scylla::prepared_statement::PreparedStatement;
-use scylla::QueryResult;
+use scylla::response::query_result::QueryResult;
 use scylla::observability::tracing::TracingInfo;
 use uuid::Uuid;
 
@@ -71,7 +71,7 @@ if let Some(id) = tracing_id {
 # use std::error::Error;
 # async fn check_only_compiles(session: &Session) -> Result<(), Box<dyn Error>> {
 use scylla::batch::Batch;
-use scylla::QueryResult;
+use scylla::response::query_result::QueryResult;
 use scylla::observability::tracing::TracingInfo;
 use uuid::Uuid;
 

examples/cqlsh-rs.rs

@@ -8,7 +8,7 @@ use scylla::client::session_builder::SessionBuilder;
 use scylla::frame::response::result::Row;
 use scylla::frame::Compression;
 use scylla::response::query_result::IntoRowsResultError;
-use scylla::QueryResult;
+use scylla::response::query_result::QueryResult;
 use std::env;
 
 #[derive(Helper, Highlighter, Validator, Hinter)]

examples/tower.rs

@@ -15,7 +15,7 @@ struct SessionService {
 
 // A trivial service implementation for sending parameterless simple string requests to Scylla.
 impl Service<scylla::query::Query> for SessionService {
-    type Response = scylla::QueryResult;
+    type Response = scylla::response::query_result::QueryResult;
     type Error = scylla::errors::QueryError;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;
 

examples/tracing.rs

@@ -7,10 +7,10 @@ use scylla::batch::Batch;
 use scylla::client::session::Session;
 use scylla::client::session_builder::SessionBuilder;
 use scylla::observability::tracing::TracingInfo;
+use scylla::response::query_result::QueryResult;
 use scylla::statement::{
     prepared_statement::PreparedStatement, query::Query, Consistency, SerialConsistency,
 };
-use scylla::QueryResult;
 use std::env;
 use std::num::NonZeroU32;
 use std::time::Duration;

scylla/src/client/caching_session.rs

@@ -4,11 +4,11 @@ use crate::client::pager::LegacyRowIterator;
 use crate::errors::QueryError;
 use crate::prepared_statement::PreparedStatement;
 use crate::query::Query;
+#[allow(deprecated)]
+use crate::response::legacy_query_result::LegacyQueryResult;
+use crate::response::query_result::QueryResult;
 use crate::routing::partitioner::PartitionerName;
 use crate::statement::{PagingState, PagingStateResponse};
-#[allow(deprecated)]
-use crate::LegacyQueryResult;
-use crate::QueryResult;
 use bytes::Bytes;
 use dashmap::DashMap;
 use futures::future::try_join_all;

scylla/src/client/session.rs

@@ -32,14 +32,14 @@ use crate::policies::retry::{QueryInfo, RetryDecision, RetrySession};
 use crate::policies::speculative_execution;
 use crate::prepared_statement::PreparedStatement;
 use crate::query::Query;
+#[allow(deprecated)]
+use crate::response::legacy_query_result::LegacyQueryResult;
 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};
-#[allow(deprecated)]
-use crate::LegacyQueryResult;
 use arc_swap::ArcSwapOption;
 use futures::future::join_all;
 use futures::future::try_join_all;

scylla/src/client/session_test.rs

@@ -2,6 +2,7 @@ use super::caching_session::CachingSession;
 use super::execution_profile::ExecutionProfile;
 use super::session::Session;
 use super::session_builder::SessionBuilder;
+use crate as scylla;
 use crate::batch::{Batch, BatchStatement};
 use crate::cluster::metadata::Strategy::NetworkTopologyStrategy;
 use crate::cluster::metadata::{CollectionType, ColumnKind, CqlType, NativeType, UserDefinedType};
@@ -20,7 +21,6 @@ use crate::utils::test_utils::{
     create_new_session_builder, scylla_supports_tablets, setup_tracing, supports_feature,
     unique_keyspace_name, PerformDDL,
 };
-use crate::{self as scylla, QueryResult};
 use assert_matches::assert_matches;
 use futures::{FutureExt, StreamExt as _, TryStreamExt};
 use itertools::Itertools;
@@ -36,7 +36,7 @@ use std::sync::Arc;
 use tokio::net::TcpListener;
 use uuid::Uuid;
 
-use crate::response::query_result::QueryRowsResult;
+use crate::response::query_result::{QueryResult, QueryRowsResult};
 
 #[tokio::test]
 async fn test_connection_failure() {

scylla/src/lib.rs

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

scylla/src/observability/driver_tracing.rs

@@ -1,8 +1,8 @@
 use crate::cluster::node::Node;
 use crate::network::Connection;
+use crate::response::query_result::QueryResult;
 use crate::routing::{Shard, Token};
 use crate::utils::pretty::{CommaSeparatedDisplayer, CqlValueDisplayer};
-use crate::QueryResult;
 use itertools::Either;
 use scylla_cql::frame::response::result::RawMetadataAndRawRows;
 use scylla_cql::frame::response::result::{deser_cql_value, ColumnSpec};