scylla: Remove scylla-macros dependency

Macros are already re-export from scylla_cql, there is no need to
complicate the dependency graph.

Author: Lorak-mmk

Cargo.lock.msrv

@@ -42,7 +42,6 @@ full-serialization = [
 unstable-testing = []
 
 [dependencies]
-scylla-macros = { version = "0.7.0", path = "../scylla-macros" }
 scylla-cql = { version = "0.4.0", path = "../scylla-cql" }
 byteorder = "1.3.4"
 bytes = "1.0.1"

scylla/Cargo.toml

@@ -28,6 +28,7 @@ use crate::policies::host_filter::HostFilter;
 use crate::routing::Token;
 use crate::statement::unprepared::Statement;
 use crate::utils::parse::{ParseErrorCause, ParseResult, ParserState};
+use crate::DeserializeRow;
 
 use futures::future::{self, FutureExt};
 use futures::stream::{self, StreamExt, TryStreamExt};
@@ -36,7 +37,6 @@ use itertools::Itertools;
 use rand::seq::{IndexedRandom, SliceRandom};
 use rand::{rng, Rng};
 use scylla_cql::frame::response::result::{ColumnSpec, TableSpec};
-use scylla_macros::DeserializeRow;
 use std::borrow::BorrowMut;
 use std::cell::Cell;
 use std::collections::HashMap;

scylla/src/cluster/metadata.rs

@@ -331,7 +331,7 @@ pub use scylla_cql::macros::SerializeRow;
 /// By default, the generated implementation will try to match the Rust field
 /// to a UDT field with the same name. This attribute instead allows to match
 /// to a UDT field with provided name.
-pub use scylla_macros::DeserializeValue;
+pub use scylla_cql::macros::DeserializeValue;
 
 /// Derive macro for the `DeserializeRow` trait that generates an implementation
 /// which deserializes a row with a similar layout to the Rust struct.
@@ -446,4 +446,4 @@ pub use scylla_macros::DeserializeValue;
 /// By default, the generated implementation will try to match the Rust field
 /// to a column with the same name. This attribute allows to match to a column
 /// with provided name.
-pub use scylla_macros::DeserializeRow;
+pub use scylla_cql::macros::DeserializeRow;

scylla/src/macros.rs

@@ -1,7 +1,7 @@
 use crate::value::CqlTimestamp;
+use crate::DeserializeRow;
 use itertools::Itertools;
 use scylla_cql::value::CqlTimeuuid;
-use scylla_macros::DeserializeRow;
 use std::collections::HashMap;
 use std::net::IpAddr;