Skip to content

Commit

Permalink
make rust 1.71 happy
Browse files Browse the repository at this point in the history
  • Loading branch information
@Centril
Centril committed Oct 17, 2023
1 parent ac24ff0 commit 7414b57
Show file tree
Hide file tree
Showing 7 changed files with 146 additions and 141 deletions.
41 changes: 22 additions & 19 deletions crates/core/src/db/datastore/locking_tx_datastore/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1147,29 +1147,32 @@ impl Inner {
}

fn algebraic_type_is_numeric(ty: &AlgebraicType) -> bool {
matches!(*ty, |AlgebraicType::I8| AlgebraicType::U8
| AlgebraicType::I16
| AlgebraicType::U16
| AlgebraicType::I32
| AlgebraicType::U32
| AlgebraicType::I64
| AlgebraicType::U64
| AlgebraicType::I128
| AlgebraicType::U128)
matches!(
*ty,
AlgebraicType::Builtin(|spacetimedb_sats::BuiltinType::I8| spacetimedb_sats::BuiltinType::U8
| spacetimedb_sats::BuiltinType::I16
| spacetimedb_sats::BuiltinType::U16
| spacetimedb_sats::BuiltinType::I32
| spacetimedb_sats::BuiltinType::U32
| spacetimedb_sats::BuiltinType::I64
| spacetimedb_sats::BuiltinType::U64
| spacetimedb_sats::BuiltinType::I128
| spacetimedb_sats::BuiltinType::U128)
)
}

fn sequence_value_to_algebraic_value(ty: &AlgebraicType, sequence_value: i128) -> AlgebraicValue {
match *ty {
AlgebraicType::I8 => (sequence_value as i8).into(),
AlgebraicType::U8 => (sequence_value as u8).into(),
AlgebraicType::I16 => (sequence_value as i16).into(),
AlgebraicType::U16 => (sequence_value as u16).into(),
AlgebraicType::I32 => (sequence_value as i32).into(),
AlgebraicType::U32 => (sequence_value as u32).into(),
AlgebraicType::I64 => (sequence_value as i64).into(),
AlgebraicType::U64 => (sequence_value as u64).into(),
AlgebraicType::I128 => sequence_value.into(),
AlgebraicType::U128 => (sequence_value as u128).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I8) => (sequence_value as i8).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U8) => (sequence_value as u8).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I16) => (sequence_value as i16).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U16) => (sequence_value as u16).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I32) => (sequence_value as i32).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U32) => (sequence_value as u32).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I64) => (sequence_value as i64).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U64) => (sequence_value as u64).into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I128) => sequence_value.into(),
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U128) => (sequence_value as u128).into(),
_ => unreachable!("should have been prevented in `fn insert`"),
}
}
Expand Down
48 changes: 24 additions & 24 deletions crates/sats/src/algebraic_type.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -245,18 +245,18 @@ impl AlgebraicType {
/// Given an AlgebraicType, returns the min value for that type.
pub fn min_value(&self) -> Option<AlgebraicValue> {
match *self {
Self::I8 => Some(i8::MIN.into()),
Self::U8 => Some(u8::MIN.into()),
Self::I16 => Some(i16::MIN.into()),
Self::U16 => Some(u16::MIN.into()),
Self::I32 => Some(i32::MIN.into()),
Self::U32 => Some(u32::MIN.into()),
Self::I64 => Some(i64::MIN.into()),
Self::U64 => Some(u64::MIN.into()),
Self::I128 => Some(i128::MIN.into()),
Self::U128 => Some(u128::MIN.into()),
Self::F32 => Some(f32::MIN.into()),
Self::F64 => Some(f64::MIN.into()),
Self::Builtin(crate::BuiltinType::I8) => Some(i8::MIN.into()),
Self::Builtin(crate::BuiltinType::U8) => Some(u8::MIN.into()),
Self::Builtin(crate::BuiltinType::I16) => Some(i16::MIN.into()),
Self::Builtin(crate::BuiltinType::U16) => Some(u16::MIN.into()),
Self::Builtin(crate::BuiltinType::I32) => Some(i32::MIN.into()),
Self::Builtin(crate::BuiltinType::U32) => Some(u32::MIN.into()),
Self::Builtin(crate::BuiltinType::I64) => Some(i64::MIN.into()),
Self::Builtin(crate::BuiltinType::U64) => Some(u64::MIN.into()),
Self::Builtin(crate::BuiltinType::I128) => Some(i128::MIN.into()),
Self::Builtin(crate::BuiltinType::U128) => Some(u128::MIN.into()),
Self::Builtin(crate::BuiltinType::F32) => Some(f32::MIN.into()),
Self::Builtin(crate::BuiltinType::F64) => Some(f64::MIN.into()),
_ => None,
}
}
Expand All @@ -265,18 +265,18 @@ impl AlgebraicType {
/// Given an AlgebraicType, returns the max value for that type.
pub fn max_value(&self) -> Option<AlgebraicValue> {
match *self {
Self::I8 => Some(i8::MAX.into()),
Self::U8 => Some(u8::MAX.into()),
Self::I16 => Some(i16::MAX.into()),
Self::U16 => Some(u16::MAX.into()),
Self::I32 => Some(i32::MAX.into()),
Self::U32 => Some(u32::MAX.into()),
Self::I64 => Some(i64::MAX.into()),
Self::U64 => Some(u64::MAX.into()),
Self::I128 => Some(i128::MAX.into()),
Self::U128 => Some(u128::MAX.into()),
Self::F32 => Some(f32::MAX.into()),
Self::F64 => Some(f64::MAX.into()),
Self::Builtin(crate::BuiltinType::I8) => Some(i8::MAX.into()),
Self::Builtin(crate::BuiltinType::U8) => Some(u8::MAX.into()),
Self::Builtin(crate::BuiltinType::I16) => Some(i16::MAX.into()),
Self::Builtin(crate::BuiltinType::U16) => Some(u16::MAX.into()),
Self::Builtin(crate::BuiltinType::I32) => Some(i32::MAX.into()),
Self::Builtin(crate::BuiltinType::U32) => Some(u32::MAX.into()),
Self::Builtin(crate::BuiltinType::I64) => Some(i64::MAX.into()),
Self::Builtin(crate::BuiltinType::U64) => Some(u64::MAX.into()),
Self::Builtin(crate::BuiltinType::I128) => Some(i128::MAX.into()),
Self::Builtin(crate::BuiltinType::U128) => Some(u128::MAX.into()),
Self::Builtin(crate::BuiltinType::F32) => Some(f32::MAX.into()),
Self::Builtin(crate::BuiltinType::F64) => Some(f64::MAX.into()),
_ => None,
}
}
Expand Down
28 changes: 14 additions & 14 deletions crates/sats/src/algebraic_type/fmt.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,20 @@ pub fn fmt_algebraic_type(ty: &AlgebraicType) -> impl '_ + Display {
AlgebraicType::Product(ty) => write!(f, "{}", fmt_product_type(ty)),
AlgebraicType::Builtin(BuiltinType::Array(a)) => write!(f, "Array<{}>", fmt(&a.elem_ty)),
AlgebraicType::Builtin(BuiltinType::Map(m)) => write!(f, "Map<{}, {}>", fmt(&m.key_ty), fmt(&m.ty)),
&AlgebraicType::Bool => write!(f, "Bool"),
&AlgebraicType::I8 => write!(f, "I8"),
&AlgebraicType::U8 => write!(f, "U8"),
&AlgebraicType::I16 => write!(f, "I16"),
&AlgebraicType::U16 => write!(f, "U16"),
&AlgebraicType::I32 => write!(f, "I32"),
&AlgebraicType::U32 => write!(f, "U32"),
&AlgebraicType::I64 => write!(f, "I64"),
&AlgebraicType::U64 => write!(f, "U64"),
&AlgebraicType::I128 => write!(f, "I128"),
&AlgebraicType::U128 => write!(f, "U128"),
&AlgebraicType::F32 => write!(f, "F32"),
&AlgebraicType::F64 => write!(f, "F64"),
&AlgebraicType::String => write!(f, "String"),
AlgebraicType::Builtin(BuiltinType::Bool) => write!(f, "Bool"),
AlgebraicType::Builtin(BuiltinType::I8) => write!(f, "I8"),
AlgebraicType::Builtin(BuiltinType::U8) => write!(f, "U8"),
AlgebraicType::Builtin(BuiltinType::I16) => write!(f, "I16"),
AlgebraicType::Builtin(BuiltinType::U16) => write!(f, "U16"),
AlgebraicType::Builtin(BuiltinType::I32) => write!(f, "I32"),
AlgebraicType::Builtin(BuiltinType::U32) => write!(f, "U32"),
AlgebraicType::Builtin(BuiltinType::I64) => write!(f, "I64"),
AlgebraicType::Builtin(BuiltinType::U64) => write!(f, "U64"),
AlgebraicType::Builtin(BuiltinType::I128) => write!(f, "I128"),
AlgebraicType::Builtin(BuiltinType::U128) => write!(f, "U128"),
AlgebraicType::Builtin(BuiltinType::F32) => write!(f, "F32"),
AlgebraicType::Builtin(BuiltinType::F64) => write!(f, "F64"),
AlgebraicType::Builtin(BuiltinType::String) => write!(f, "String"),
})
}

Expand Down
28 changes: 14 additions & 14 deletions crates/sats/src/algebraic_type/map_notation.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@ pub fn fmt_algebraic_type(ty: &AlgebraicType) -> impl '_ + fmt::Display {
}
AlgebraicType::Builtin(Array(ty)) => write!(f, "{{ ty_: Array, 0: {} }}", fmt(&ty.elem_ty)),
AlgebraicType::Builtin(Map(map)) => write!(f, "{{ ty_: Map, 0: {}, 1: {} }}", fmt(&map.key_ty), fmt(&map.ty)),
&AlgebraicType::Bool => write!(f, "{{ ty_: Bool }}"),
&AlgebraicType::I8 => write!(f, "{{ ty_: I8 }}"),
&AlgebraicType::U8 => write!(f, "{{ ty_: U8 }}"),
&AlgebraicType::I16 => write!(f, "{{ ty_: I16 }}"),
&AlgebraicType::U16 => write!(f, "{{ ty_: U16 }}"),
&AlgebraicType::I32 => write!(f, "{{ ty_: I32 }}"),
&AlgebraicType::U32 => write!(f, "{{ ty_: U32 }}"),
&AlgebraicType::I64 => write!(f, "{{ ty_: I64 }}"),
&AlgebraicType::U64 => write!(f, "{{ ty_: U64 }}"),
&AlgebraicType::I128 => write!(f, "{{ ty_: I128 }}"),
&AlgebraicType::U128 => write!(f, "{{ ty_: U128 }}"),
&AlgebraicType::F32 => write!(f, "{{ ty_: F32 }}"),
&AlgebraicType::F64 => write!(f, "{{ ty_: F64 }}"),
&AlgebraicType::String => write!(f, "{{ ty_: String }}"),
AlgebraicType::Builtin(Bool) => write!(f, "{{ ty_: Bool }}"),
AlgebraicType::Builtin(I8) => write!(f, "{{ ty_: I8 }}"),
AlgebraicType::Builtin(U8) => write!(f, "{{ ty_: U8 }}"),
AlgebraicType::Builtin(I16) => write!(f, "{{ ty_: I16 }}"),
AlgebraicType::Builtin(U16) => write!(f, "{{ ty_: U16 }}"),
AlgebraicType::Builtin(I32) => write!(f, "{{ ty_: I32 }}"),
AlgebraicType::Builtin(U32) => write!(f, "{{ ty_: U32 }}"),
AlgebraicType::Builtin(I64) => write!(f, "{{ ty_: I64 }}"),
AlgebraicType::Builtin(U64) => write!(f, "{{ ty_: U64 }}"),
AlgebraicType::Builtin(I128) => write!(f, "{{ ty_: I128 }}"),
AlgebraicType::Builtin(U128) => write!(f, "{{ ty_: U128 }}"),
AlgebraicType::Builtin(F32) => write!(f, "{{ ty_: F32 }}"),
AlgebraicType::Builtin(F64) => write!(f, "{{ ty_: F64 }}"),
AlgebraicType::Builtin(String) => write!(f, "{{ ty_: String }}"),
})
}
58 changes: 30 additions & 28 deletions crates/sats/src/de/impls.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,20 +304,20 @@ impl<'de> DeserializeSeed<'de> for WithTypespace<'_, AlgebraicType> {
AlgebraicType::Product(prod) => self.with(prod).deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::Array(ty)) => self.with(ty).deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::Map(ty)) => self.with(&**ty).deserialize(de).map(Into::into),
&AlgebraicType::Bool => bool::deserialize(de).map(Into::into),
&AlgebraicType::I8 => i8::deserialize(de).map(Into::into),
&AlgebraicType::U8 => u8::deserialize(de).map(Into::into),
&AlgebraicType::I16 => i16::deserialize(de).map(Into::into),
&AlgebraicType::U16 => u16::deserialize(de).map(Into::into),
&AlgebraicType::I32 => i32::deserialize(de).map(Into::into),
&AlgebraicType::U32 => u32::deserialize(de).map(Into::into),
&AlgebraicType::I64 => i64::deserialize(de).map(Into::into),
&AlgebraicType::U64 => u64::deserialize(de).map(Into::into),
&AlgebraicType::I128 => i128::deserialize(de).map(Into::into),
&AlgebraicType::U128 => u128::deserialize(de).map(Into::into),
&AlgebraicType::F32 => f32::deserialize(de).map(Into::into),
&AlgebraicType::F64 => f64::deserialize(de).map(Into::into),
&AlgebraicType::String => String::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::Bool) => bool::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::I8) => i8::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::U8) => u8::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::I16) => i16::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::U16) => u16::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::I32) => i32::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::U32) => u32::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::I64) => i64::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::U64) => u64::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::I128) => i128::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::U128) => u128::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::F32) => f32::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::F64) => f64::deserialize(de).map(Into::into),
AlgebraicType::Builtin(crate::BuiltinType::String) => String::deserialize(de).map(Into::into),
}
}
}
Expand Down Expand Up @@ -441,20 +441,22 @@ impl<'de> DeserializeSeed<'de> for WithTypespace<'_, ArrayType> {
AlgebraicType::Builtin(crate::BuiltinType::Map(ty)) => deserializer
.deserialize_array_seed(BasicVecVisitor, self.with(&**ty))
.map(ArrayValue::Map),
&AlgebraicType::Bool => de_array(deserializer, ArrayValue::Bool),
&AlgebraicType::I8 => de_array(deserializer, ArrayValue::I8),
&AlgebraicType::U8 => deserializer.deserialize_bytes(OwnedSliceVisitor).map(ArrayValue::U8),
&AlgebraicType::I16 => de_array(deserializer, ArrayValue::I16),
&AlgebraicType::U16 => de_array(deserializer, ArrayValue::U16),
&AlgebraicType::I32 => de_array(deserializer, ArrayValue::I32),
&AlgebraicType::U32 => de_array(deserializer, ArrayValue::U32),
&AlgebraicType::I64 => de_array(deserializer, ArrayValue::I64),
&AlgebraicType::U64 => de_array(deserializer, ArrayValue::U64),
&AlgebraicType::I128 => de_array(deserializer, ArrayValue::I128),
&AlgebraicType::U128 => de_array(deserializer, ArrayValue::U128),
&AlgebraicType::F32 => de_array(deserializer, ArrayValue::F32),
&AlgebraicType::F64 => de_array(deserializer, ArrayValue::F64),
&AlgebraicType::String => de_array(deserializer, ArrayValue::String),
AlgebraicType::Builtin(crate::BuiltinType::Bool) => de_array(deserializer, ArrayValue::Bool),
AlgebraicType::Builtin(crate::BuiltinType::I8) => de_array(deserializer, ArrayValue::I8),
AlgebraicType::Builtin(crate::BuiltinType::U8) => {
deserializer.deserialize_bytes(OwnedSliceVisitor).map(ArrayValue::U8)
}
AlgebraicType::Builtin(crate::BuiltinType::I16) => de_array(deserializer, ArrayValue::I16),
AlgebraicType::Builtin(crate::BuiltinType::U16) => de_array(deserializer, ArrayValue::U16),
AlgebraicType::Builtin(crate::BuiltinType::I32) => de_array(deserializer, ArrayValue::I32),
AlgebraicType::Builtin(crate::BuiltinType::U32) => de_array(deserializer, ArrayValue::U32),
AlgebraicType::Builtin(crate::BuiltinType::I64) => de_array(deserializer, ArrayValue::I64),
AlgebraicType::Builtin(crate::BuiltinType::U64) => de_array(deserializer, ArrayValue::U64),
AlgebraicType::Builtin(crate::BuiltinType::I128) => de_array(deserializer, ArrayValue::I128),
AlgebraicType::Builtin(crate::BuiltinType::U128) => de_array(deserializer, ArrayValue::U128),
AlgebraicType::Builtin(crate::BuiltinType::F32) => de_array(deserializer, ArrayValue::F32),
AlgebraicType::Builtin(crate::BuiltinType::F64) => de_array(deserializer, ArrayValue::F64),
AlgebraicType::Builtin(crate::BuiltinType::String) => de_array(deserializer, ArrayValue::String),
};
}
}
Expand Down
Loading

0 comments on commit 7414b57

Please sign in to comment.