Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: target build and cargo fmt issues #50

Merged
merged 2 commits into from
Nov 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly"
channel = "stable"
2 changes: 1 addition & 1 deletion src/cluster/scylla_cluster.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/query_parameter.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/helpers/query_results.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down
2 changes: 1 addition & 1 deletion src/session/scylla_session.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/session/topology.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/types/tracing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ impl Serialize for CqlTimestampWrapper {
where
S: serde::Serializer,
{
serializer.serialize_i64(self.0.0)
serializer.serialize_i64(self.0 .0)
}
}

Expand Down