Skip to content

Commit f945d40

Browse files
committed
cass_types: remove consistency conversion impls
`impl TryFrom<CassConsistency> for (Serial)Consistency` are removed, as they are: - Not used anymore in the codebase. - Prone to misuse, because there are two different semantics of such conversion: 1. For statement/batch/exec_profile, where `CASS_CONSISTENCY_UNKNOWN` is allowed and must be handled. 2. For cluster, where `CASS_CONSISTENCY_UNKNOWN` is not allowed, and must result in an error. As a bug-resitant alternative, the `MaybeUnsetConfig` type is promoted.
1 parent c53dc00 commit f945d40

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

scylla-rust-wrapper/src/cass_types.rs

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@ use crate::cass_error::CassError;
33
use crate::types::*;
44
use scylla::cluster::metadata::{CollectionType, NativeType};
55
use scylla::frame::response::result::ColumnType;
6-
use scylla::frame::types::{Consistency, SerialConsistency};
76
use scylla::statement::batch::BatchType;
87
use std::cell::UnsafeCell;
9-
use std::convert::TryFrom;
108
use std::os::raw::c_char;
119
use std::sync::Arc;
1210

@@ -894,39 +892,6 @@ pub unsafe extern "C" fn cass_data_type_add_sub_value_type_by_name_n(
894892
}
895893
}
896894

897-
impl TryFrom<CassConsistency> for Consistency {
898-
type Error = ();
899-
900-
fn try_from(c: CassConsistency) -> Result<Consistency, Self::Error> {
901-
match c {
902-
CassConsistency::CASS_CONSISTENCY_ANY => Ok(Consistency::Any),
903-
CassConsistency::CASS_CONSISTENCY_ONE => Ok(Consistency::One),
904-
CassConsistency::CASS_CONSISTENCY_TWO => Ok(Consistency::Two),
905-
CassConsistency::CASS_CONSISTENCY_THREE => Ok(Consistency::Three),
906-
CassConsistency::CASS_CONSISTENCY_QUORUM => Ok(Consistency::Quorum),
907-
CassConsistency::CASS_CONSISTENCY_ALL => Ok(Consistency::All),
908-
CassConsistency::CASS_CONSISTENCY_LOCAL_QUORUM => Ok(Consistency::LocalQuorum),
909-
CassConsistency::CASS_CONSISTENCY_EACH_QUORUM => Ok(Consistency::EachQuorum),
910-
CassConsistency::CASS_CONSISTENCY_LOCAL_ONE => Ok(Consistency::LocalOne),
911-
CassConsistency::CASS_CONSISTENCY_LOCAL_SERIAL => Ok(Consistency::LocalSerial),
912-
CassConsistency::CASS_CONSISTENCY_SERIAL => Ok(Consistency::Serial),
913-
_ => Err(()),
914-
}
915-
}
916-
}
917-
918-
impl TryFrom<CassConsistency> for SerialConsistency {
919-
type Error = ();
920-
921-
fn try_from(serial: CassConsistency) -> Result<SerialConsistency, Self::Error> {
922-
match serial {
923-
CassConsistency::CASS_CONSISTENCY_SERIAL => Ok(SerialConsistency::Serial),
924-
CassConsistency::CASS_CONSISTENCY_LOCAL_SERIAL => Ok(SerialConsistency::LocalSerial),
925-
_ => Err(()),
926-
}
927-
}
928-
}
929-
930895
pub(crate) fn make_batch_type(type_: CassBatchType) -> Option<BatchType> {
931896
match type_ {
932897
CassBatchType::CASS_BATCH_TYPE_LOGGED => Some(BatchType::Logged),

0 commit comments

Comments
 (0)