Merge pull request #1133 from muzarski/cpp-rust-decouple-query-rows-result

rows_result: implement into_inner behind `cpp_rust_unstable` cfg

Author: Lorak-mmk

.github/workflows/rust.yml

@@ -40,6 +40,8 @@ jobs:
       run: cargo clippy --verbose --all-targets
     - name: Clippy check with all features
       run: cargo clippy --verbose --all-targets --all-features
+    - name: Cargo check with cpp_rust_unstable cfg
+      run: RUSTFLAGS="--cfg cpp_rust_unstable" cargo clippy --verbose --all-targets --all-features
     - name: Cargo check without features
       run: cargo check --all-targets --manifest-path "scylla/Cargo.toml" --features ""
     - name: Cargo check with all serialization features

scylla/Cargo.toml

@@ -98,4 +98,8 @@ harness = false
 [lints.rust]
 unnameable_types = "warn"
 unreachable_pub = "warn"
-unexpected_cfgs = { level = "warn", check-cfg = ['cfg(scylla_cloud_tests)', 'cfg(cassandra_tests)'] }
+unexpected_cfgs = { level = "warn", check-cfg = [
+    'cfg(scylla_cloud_tests)',
+    'cfg(cassandra_tests)',
+    'cfg(cpp_rust_unstable)',
+] }

scylla/src/lib.rs

@@ -118,6 +118,9 @@ pub mod frame {
         pub(crate) use scylla_cql::frame::response::*;
 
         pub mod result {
+            #[cfg(cpp_rust_unstable)]
+            pub use scylla_cql::frame::response::result::DeserializedMetadataAndRawRows;
+
             pub(crate) use scylla_cql::frame::response::result::*;
             pub use scylla_cql::frame::response::result::{
                 ColumnSpec, ColumnType, CqlValue, PartitionKeyIndex, Row, TableSpec,

scylla/src/transport/query_result.rs

@@ -433,6 +433,17 @@ impl QueryRowsResult {
             Err(RowsError::TypeCheckFailed(err)) => Err(SingleRowError::TypeCheckFailed(err)),
         }
     }
+
+    #[cfg(cpp_rust_unstable)]
+    pub fn into_inner(self) -> (DeserializedMetadataAndRawRows, Option<Uuid>, Vec<String>) {
+        let Self {
+            raw_rows_with_metadata,
+            tracing_id,
+            warnings,
+        } = self;
+
+        (raw_rows_with_metadata, tracing_id, warnings)
+    }
 }
 
 /// An error returned by [`QueryResult::into_rows_result`]