From e5713ce5f7aeaa7be8cf63417d98bbd02d3ce121 Mon Sep 17 00:00:00 2001 From: Gabriel do Carmo Vieira <48625433+gvieira18@users.noreply.github.com> Date: Sat, 9 Nov 2024 18:51:18 -0300 Subject: [PATCH 1/2] chore: update toolchain from nightly to stable Signed-off-by: Gabriel do Carmo Vieira <48625433+gvieira18@users.noreply.github.com> --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 5d56faf..292fe49 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "nightly" +channel = "stable" From 66cb8ed152b1c596f5d4efa265248af9689431d0 Mon Sep 17 00:00:00 2001 From: Gabriel do Carmo Vieira <48625433+gvieira18@users.noreply.github.com> Date: Sat, 9 Nov 2024 18:51:27 -0300 Subject: [PATCH 2/2] fix: format issues Signed-off-by: Gabriel do Carmo Vieira <48625433+gvieira18@users.noreply.github.com> --- src/cluster/scylla_cluster.rs | 2 +- src/helpers/query_parameter.rs | 2 +- src/helpers/query_results.rs | 2 +- src/session/scylla_session.rs | 2 +- src/session/topology.rs | 2 +- src/types/tracing.rs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cluster/scylla_cluster.rs b/src/cluster/scylla_cluster.rs index f93b1ef..484995b 100644 --- a/src/cluster/scylla_cluster.rs +++ b/src/cluster/scylla_cluster.rs @@ -5,7 +5,7 @@ use openssl::ssl::{SslContextBuilder, SslFiletype}; use crate::{ cluster::{ - cluster_config::{ClusterConfig, compression::Compression}, + cluster_config::{compression::Compression, ClusterConfig}, execution_profile::ExecutionProfile, }, session::scylla_session::ScyllaSession, diff --git a/src/helpers/query_parameter.rs b/src/helpers/query_parameter.rs index 1a3af00..2039dc1 100644 --- a/src/helpers/query_parameter.rs +++ b/src/helpers/query_parameter.rs @@ -1,7 +1,7 @@ use scylla::serialize::{ - RowWriter, SerializationError, row::{RowSerializationContext, SerializeRow}, value::SerializeCql, + RowWriter, SerializationError, }; use super::{cql_value_bridge::ParameterWithMapType, to_cql_value::ToCqlValue}; diff --git a/src/helpers/query_results.rs b/src/helpers/query_results.rs index dfef807..58a4e22 100644 --- a/src/helpers/query_results.rs +++ b/src/helpers/query_results.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use napi::bindgen_prelude::{BigInt, Either9, Either10, Either11}; +use napi::bindgen_prelude::{BigInt, Either10, Either11, Either9}; use scylla::frame::response::result::{ColumnType, CqlValue}; use crate::types::{decimal::Decimal, duration::Duration, uuid::Uuid}; diff --git a/src/session/scylla_session.rs b/src/session/scylla_session.rs index e6e135c..26f2cbb 100644 --- a/src/session/scylla_session.rs +++ b/src/session/scylla_session.rs @@ -6,8 +6,8 @@ use crate::query::scylla_prepared_statement::PreparedStatement; use crate::query::scylla_query::Query; use crate::types::tracing::TracingReturn; use crate::types::uuid::Uuid; -use napi::Either; use napi::bindgen_prelude::Either3; +use napi::Either; use scylla::statement::query::Query as ScyllaQuery; use super::metrics; diff --git a/src/session/topology.rs b/src/session/topology.rs index 955c825..8d3a878 100644 --- a/src/session/topology.rs +++ b/src/session/topology.rs @@ -2,8 +2,8 @@ use std::collections::HashMap; use std::sync::Arc; use napi::bindgen_prelude::Either3; -use scylla::transport::ClusterData; use scylla::transport::topology::{Keyspace, MaterializedView, Strategy, Table}; +use scylla::transport::ClusterData; // ============= ClusterData ============= // #[napi] diff --git a/src/types/tracing.rs b/src/types/tracing.rs index ea4a5d1..8a14aa7 100644 --- a/src/types/tracing.rs +++ b/src/types/tracing.rs @@ -15,7 +15,7 @@ impl Serialize for CqlTimestampWrapper { where S: serde::Serializer, { - serializer.serialize_i64(self.0.0) + serializer.serialize_i64(self.0 .0) } }