Skip to content

Commit 3747904

Browse files
jdetterjdetter
committed
Merge remote-tracking branch 'origin/1.71-rust-happy' into v0.7.1-beta-hotfix1
2 parents fb32970 + 7414b57 commit 3747904

File tree

7 files changed

+146
-141
lines changed

7 files changed

+146
-141
lines changed

‎crates/core/src/db/datastore/locking_tx_datastore/mod.rs‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1147,29 +1147,32 @@ impl Inner {
11471147
}
11481148

11491149
fn algebraic_type_is_numeric(ty: &AlgebraicType) -> bool {
1150-
matches!(*ty, |AlgebraicType::I8| AlgebraicType::U8
1151-
| AlgebraicType::I16
1152-
| AlgebraicType::U16
1153-
| AlgebraicType::I32
1154-
| AlgebraicType::U32
1155-
| AlgebraicType::I64
1156-
| AlgebraicType::U64
1157-
| AlgebraicType::I128
1158-
| AlgebraicType::U128)
1150+
matches!(
1151+
*ty,
1152+
AlgebraicType::Builtin(|spacetimedb_sats::BuiltinType::I8| spacetimedb_sats::BuiltinType::U8
1153+
| spacetimedb_sats::BuiltinType::I16
1154+
| spacetimedb_sats::BuiltinType::U16
1155+
| spacetimedb_sats::BuiltinType::I32
1156+
| spacetimedb_sats::BuiltinType::U32
1157+
| spacetimedb_sats::BuiltinType::I64
1158+
| spacetimedb_sats::BuiltinType::U64
1159+
| spacetimedb_sats::BuiltinType::I128
1160+
| spacetimedb_sats::BuiltinType::U128)
1161+
)
11591162
}
11601163

11611164
fn sequence_value_to_algebraic_value(ty: &AlgebraicType, sequence_value: i128) -> AlgebraicValue {
11621165
match *ty {
1163-
AlgebraicType::I8 => (sequence_value as i8).into(),
1164-
AlgebraicType::U8 => (sequence_value as u8).into(),
1165-
AlgebraicType::I16 => (sequence_value as i16).into(),
1166-
AlgebraicType::U16 => (sequence_value as u16).into(),
1167-
AlgebraicType::I32 => (sequence_value as i32).into(),
1168-
AlgebraicType::U32 => (sequence_value as u32).into(),
1169-
AlgebraicType::I64 => (sequence_value as i64).into(),
1170-
AlgebraicType::U64 => (sequence_value as u64).into(),
1171-
AlgebraicType::I128 => sequence_value.into(),
1172-
AlgebraicType::U128 => (sequence_value as u128).into(),
1166+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I8) => (sequence_value as i8).into(),
1167+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U8) => (sequence_value as u8).into(),
1168+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I16) => (sequence_value as i16).into(),
1169+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U16) => (sequence_value as u16).into(),
1170+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I32) => (sequence_value as i32).into(),
1171+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U32) => (sequence_value as u32).into(),
1172+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I64) => (sequence_value as i64).into(),
1173+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U64) => (sequence_value as u64).into(),
1174+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::I128) => sequence_value.into(),
1175+
AlgebraicType::Builtin(spacetimedb_sats::BuiltinType::U128) => (sequence_value as u128).into(),
11731176
_ => unreachable!("should have been prevented in `fn insert`"),
11741177
}
11751178
}

‎crates/sats/src/algebraic_type.rs‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -245,18 +245,18 @@ impl AlgebraicType {
245245
/// Given an AlgebraicType, returns the min value for that type.
246246
pub fn min_value(&self) -> Option<AlgebraicValue> {
247247
match *self {
248-
Self::I8 => Some(i8::MIN.into()),
249-
Self::U8 => Some(u8::MIN.into()),
250-
Self::I16 => Some(i16::MIN.into()),
251-
Self::U16 => Some(u16::MIN.into()),
252-
Self::I32 => Some(i32::MIN.into()),
253-
Self::U32 => Some(u32::MIN.into()),
254-
Self::I64 => Some(i64::MIN.into()),
255-
Self::U64 => Some(u64::MIN.into()),
256-
Self::I128 => Some(i128::MIN.into()),
257-
Self::U128 => Some(u128::MIN.into()),
258-
Self::F32 => Some(f32::MIN.into()),
259-
Self::F64 => Some(f64::MIN.into()),
248+
Self::Builtin(crate::BuiltinType::I8) => Some(i8::MIN.into()),
249+
Self::Builtin(crate::BuiltinType::U8) => Some(u8::MIN.into()),
250+
Self::Builtin(crate::BuiltinType::I16) => Some(i16::MIN.into()),
251+
Self::Builtin(crate::BuiltinType::U16) => Some(u16::MIN.into()),
252+
Self::Builtin(crate::BuiltinType::I32) => Some(i32::MIN.into()),
253+
Self::Builtin(crate::BuiltinType::U32) => Some(u32::MIN.into()),
254+
Self::Builtin(crate::BuiltinType::I64) => Some(i64::MIN.into()),
255+
Self::Builtin(crate::BuiltinType::U64) => Some(u64::MIN.into()),
256+
Self::Builtin(crate::BuiltinType::I128) => Some(i128::MIN.into()),
257+
Self::Builtin(crate::BuiltinType::U128) => Some(u128::MIN.into()),
258+
Self::Builtin(crate::BuiltinType::F32) => Some(f32::MIN.into()),
259+
Self::Builtin(crate::BuiltinType::F64) => Some(f64::MIN.into()),
260260
_ => None,
261261
}
262262
}
@@ -265,18 +265,18 @@ impl AlgebraicType {
265265
/// Given an AlgebraicType, returns the max value for that type.
266266
pub fn max_value(&self) -> Option<AlgebraicValue> {
267267
match *self {
268-
Self::I8 => Some(i8::MAX.into()),
269-
Self::U8 => Some(u8::MAX.into()),
270-
Self::I16 => Some(i16::MAX.into()),
271-
Self::U16 => Some(u16::MAX.into()),
272-
Self::I32 => Some(i32::MAX.into()),
273-
Self::U32 => Some(u32::MAX.into()),
274-
Self::I64 => Some(i64::MAX.into()),
275-
Self::U64 => Some(u64::MAX.into()),
276-
Self::I128 => Some(i128::MAX.into()),
277-
Self::U128 => Some(u128::MAX.into()),
278-
Self::F32 => Some(f32::MAX.into()),
279-
Self::F64 => Some(f64::MAX.into()),
268+
Self::Builtin(crate::BuiltinType::I8) => Some(i8::MAX.into()),
269+
Self::Builtin(crate::BuiltinType::U8) => Some(u8::MAX.into()),
270+
Self::Builtin(crate::BuiltinType::I16) => Some(i16::MAX.into()),
271+
Self::Builtin(crate::BuiltinType::U16) => Some(u16::MAX.into()),
272+
Self::Builtin(crate::BuiltinType::I32) => Some(i32::MAX.into()),
273+
Self::Builtin(crate::BuiltinType::U32) => Some(u32::MAX.into()),
274+
Self::Builtin(crate::BuiltinType::I64) => Some(i64::MAX.into()),
275+
Self::Builtin(crate::BuiltinType::U64) => Some(u64::MAX.into()),
276+
Self::Builtin(crate::BuiltinType::I128) => Some(i128::MAX.into()),
277+
Self::Builtin(crate::BuiltinType::U128) => Some(u128::MAX.into()),
278+
Self::Builtin(crate::BuiltinType::F32) => Some(f32::MAX.into()),
279+
Self::Builtin(crate::BuiltinType::F64) => Some(f64::MAX.into()),
280280
_ => None,
281281
}
282282
}

‎crates/sats/src/algebraic_type/fmt.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,20 @@ pub fn fmt_algebraic_type(ty: &AlgebraicType) -> impl '_ + Display {
1919
AlgebraicType::Product(ty) => write!(f, "{}", fmt_product_type(ty)),
2020
AlgebraicType::Builtin(BuiltinType::Array(a)) => write!(f, "Array<{}>", fmt(&a.elem_ty)),
2121
AlgebraicType::Builtin(BuiltinType::Map(m)) => write!(f, "Map<{}, {}>", fmt(&m.key_ty), fmt(&m.ty)),
22-
&AlgebraicType::Bool => write!(f, "Bool"),
23-
&AlgebraicType::I8 => write!(f, "I8"),
24-
&AlgebraicType::U8 => write!(f, "U8"),
25-
&AlgebraicType::I16 => write!(f, "I16"),
26-
&AlgebraicType::U16 => write!(f, "U16"),
27-
&AlgebraicType::I32 => write!(f, "I32"),
28-
&AlgebraicType::U32 => write!(f, "U32"),
29-
&AlgebraicType::I64 => write!(f, "I64"),
30-
&AlgebraicType::U64 => write!(f, "U64"),
31-
&AlgebraicType::I128 => write!(f, "I128"),
32-
&AlgebraicType::U128 => write!(f, "U128"),
33-
&AlgebraicType::F32 => write!(f, "F32"),
34-
&AlgebraicType::F64 => write!(f, "F64"),
35-
&AlgebraicType::String => write!(f, "String"),
22+
AlgebraicType::Builtin(BuiltinType::Bool) => write!(f, "Bool"),
23+
AlgebraicType::Builtin(BuiltinType::I8) => write!(f, "I8"),
24+
AlgebraicType::Builtin(BuiltinType::U8) => write!(f, "U8"),
25+
AlgebraicType::Builtin(BuiltinType::I16) => write!(f, "I16"),
26+
AlgebraicType::Builtin(BuiltinType::U16) => write!(f, "U16"),
27+
AlgebraicType::Builtin(BuiltinType::I32) => write!(f, "I32"),
28+
AlgebraicType::Builtin(BuiltinType::U32) => write!(f, "U32"),
29+
AlgebraicType::Builtin(BuiltinType::I64) => write!(f, "I64"),
30+
AlgebraicType::Builtin(BuiltinType::U64) => write!(f, "U64"),
31+
AlgebraicType::Builtin(BuiltinType::I128) => write!(f, "I128"),
32+
AlgebraicType::Builtin(BuiltinType::U128) => write!(f, "U128"),
33+
AlgebraicType::Builtin(BuiltinType::F32) => write!(f, "F32"),
34+
AlgebraicType::Builtin(BuiltinType::F64) => write!(f, "F64"),
35+
AlgebraicType::Builtin(BuiltinType::String) => write!(f, "String"),
3636
})
3737
}
3838

‎crates/sats/src/algebraic_type/map_notation.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ pub fn fmt_algebraic_type(ty: &AlgebraicType) -> impl '_ + fmt::Display {
3131
}
3232
AlgebraicType::Builtin(Array(ty)) => write!(f, "{{ ty_: Array, 0: {} }}", fmt(&ty.elem_ty)),
3333
AlgebraicType::Builtin(Map(map)) => write!(f, "{{ ty_: Map, 0: {}, 1: {} }}", fmt(&map.key_ty), fmt(&map.ty)),
34-
&AlgebraicType::Bool => write!(f, "{{ ty_: Bool }}"),
35-
&AlgebraicType::I8 => write!(f, "{{ ty_: I8 }}"),
36-
&AlgebraicType::U8 => write!(f, "{{ ty_: U8 }}"),
37-
&AlgebraicType::I16 => write!(f, "{{ ty_: I16 }}"),
38-
&AlgebraicType::U16 => write!(f, "{{ ty_: U16 }}"),
39-
&AlgebraicType::I32 => write!(f, "{{ ty_: I32 }}"),
40-
&AlgebraicType::U32 => write!(f, "{{ ty_: U32 }}"),
41-
&AlgebraicType::I64 => write!(f, "{{ ty_: I64 }}"),
42-
&AlgebraicType::U64 => write!(f, "{{ ty_: U64 }}"),
43-
&AlgebraicType::I128 => write!(f, "{{ ty_: I128 }}"),
44-
&AlgebraicType::U128 => write!(f, "{{ ty_: U128 }}"),
45-
&AlgebraicType::F32 => write!(f, "{{ ty_: F32 }}"),
46-
&AlgebraicType::F64 => write!(f, "{{ ty_: F64 }}"),
47-
&AlgebraicType::String => write!(f, "{{ ty_: String }}"),
34+
AlgebraicType::Builtin(Bool) => write!(f, "{{ ty_: Bool }}"),
35+
AlgebraicType::Builtin(I8) => write!(f, "{{ ty_: I8 }}"),
36+
AlgebraicType::Builtin(U8) => write!(f, "{{ ty_: U8 }}"),
37+
AlgebraicType::Builtin(I16) => write!(f, "{{ ty_: I16 }}"),
38+
AlgebraicType::Builtin(U16) => write!(f, "{{ ty_: U16 }}"),
39+
AlgebraicType::Builtin(I32) => write!(f, "{{ ty_: I32 }}"),
40+
AlgebraicType::Builtin(U32) => write!(f, "{{ ty_: U32 }}"),
41+
AlgebraicType::Builtin(I64) => write!(f, "{{ ty_: I64 }}"),
42+
AlgebraicType::Builtin(U64) => write!(f, "{{ ty_: U64 }}"),
43+
AlgebraicType::Builtin(I128) => write!(f, "{{ ty_: I128 }}"),
44+
AlgebraicType::Builtin(U128) => write!(f, "{{ ty_: U128 }}"),
45+
AlgebraicType::Builtin(F32) => write!(f, "{{ ty_: F32 }}"),
46+
AlgebraicType::Builtin(F64) => write!(f, "{{ ty_: F64 }}"),
47+
AlgebraicType::Builtin(String) => write!(f, "{{ ty_: String }}"),
4848
})
4949
}

‎crates/sats/src/de/impls.rs‎

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -304,20 +304,20 @@ impl<'de> DeserializeSeed<'de> for WithTypespace<'_, AlgebraicType> {
304304
AlgebraicType::Product(prod) => self.with(prod).deserialize(de).map(Into::into),
305305
AlgebraicType::Builtin(crate::BuiltinType::Array(ty)) => self.with(ty).deserialize(de).map(Into::into),
306306
AlgebraicType::Builtin(crate::BuiltinType::Map(ty)) => self.with(&**ty).deserialize(de).map(Into::into),
307-
&AlgebraicType::Bool => bool::deserialize(de).map(Into::into),
308-
&AlgebraicType::I8 => i8::deserialize(de).map(Into::into),
309-
&AlgebraicType::U8 => u8::deserialize(de).map(Into::into),
310-
&AlgebraicType::I16 => i16::deserialize(de).map(Into::into),
311-
&AlgebraicType::U16 => u16::deserialize(de).map(Into::into),
312-
&AlgebraicType::I32 => i32::deserialize(de).map(Into::into),
313-
&AlgebraicType::U32 => u32::deserialize(de).map(Into::into),
314-
&AlgebraicType::I64 => i64::deserialize(de).map(Into::into),
315-
&AlgebraicType::U64 => u64::deserialize(de).map(Into::into),
316-
&AlgebraicType::I128 => i128::deserialize(de).map(Into::into),
317-
&AlgebraicType::U128 => u128::deserialize(de).map(Into::into),
318-
&AlgebraicType::F32 => f32::deserialize(de).map(Into::into),
319-
&AlgebraicType::F64 => f64::deserialize(de).map(Into::into),
320-
&AlgebraicType::String => String::deserialize(de).map(Into::into),
307+
AlgebraicType::Builtin(crate::BuiltinType::Bool) => bool::deserialize(de).map(Into::into),
308+
AlgebraicType::Builtin(crate::BuiltinType::I8) => i8::deserialize(de).map(Into::into),
309+
AlgebraicType::Builtin(crate::BuiltinType::U8) => u8::deserialize(de).map(Into::into),
310+
AlgebraicType::Builtin(crate::BuiltinType::I16) => i16::deserialize(de).map(Into::into),
311+
AlgebraicType::Builtin(crate::BuiltinType::U16) => u16::deserialize(de).map(Into::into),
312+
AlgebraicType::Builtin(crate::BuiltinType::I32) => i32::deserialize(de).map(Into::into),
313+
AlgebraicType::Builtin(crate::BuiltinType::U32) => u32::deserialize(de).map(Into::into),
314+
AlgebraicType::Builtin(crate::BuiltinType::I64) => i64::deserialize(de).map(Into::into),
315+
AlgebraicType::Builtin(crate::BuiltinType::U64) => u64::deserialize(de).map(Into::into),
316+
AlgebraicType::Builtin(crate::BuiltinType::I128) => i128::deserialize(de).map(Into::into),
317+
AlgebraicType::Builtin(crate::BuiltinType::U128) => u128::deserialize(de).map(Into::into),
318+
AlgebraicType::Builtin(crate::BuiltinType::F32) => f32::deserialize(de).map(Into::into),
319+
AlgebraicType::Builtin(crate::BuiltinType::F64) => f64::deserialize(de).map(Into::into),
320+
AlgebraicType::Builtin(crate::BuiltinType::String) => String::deserialize(de).map(Into::into),
321321
}
322322
}
323323
}
@@ -441,20 +441,22 @@ impl<'de> DeserializeSeed<'de> for WithTypespace<'_, ArrayType> {
441441
AlgebraicType::Builtin(crate::BuiltinType::Map(ty)) => deserializer
442442
.deserialize_array_seed(BasicVecVisitor, self.with(&**ty))
443443
.map(ArrayValue::Map),
444-
&AlgebraicType::Bool => de_array(deserializer, ArrayValue::Bool),
445-
&AlgebraicType::I8 => de_array(deserializer, ArrayValue::I8),
446-
&AlgebraicType::U8 => deserializer.deserialize_bytes(OwnedSliceVisitor).map(ArrayValue::U8),
447-
&AlgebraicType::I16 => de_array(deserializer, ArrayValue::I16),
448-
&AlgebraicType::U16 => de_array(deserializer, ArrayValue::U16),
449-
&AlgebraicType::I32 => de_array(deserializer, ArrayValue::I32),
450-
&AlgebraicType::U32 => de_array(deserializer, ArrayValue::U32),
451-
&AlgebraicType::I64 => de_array(deserializer, ArrayValue::I64),
452-
&AlgebraicType::U64 => de_array(deserializer, ArrayValue::U64),
453-
&AlgebraicType::I128 => de_array(deserializer, ArrayValue::I128),
454-
&AlgebraicType::U128 => de_array(deserializer, ArrayValue::U128),
455-
&AlgebraicType::F32 => de_array(deserializer, ArrayValue::F32),
456-
&AlgebraicType::F64 => de_array(deserializer, ArrayValue::F64),
457-
&AlgebraicType::String => de_array(deserializer, ArrayValue::String),
444+
AlgebraicType::Builtin(crate::BuiltinType::Bool) => de_array(deserializer, ArrayValue::Bool),
445+
AlgebraicType::Builtin(crate::BuiltinType::I8) => de_array(deserializer, ArrayValue::I8),
446+
AlgebraicType::Builtin(crate::BuiltinType::U8) => {
447+
deserializer.deserialize_bytes(OwnedSliceVisitor).map(ArrayValue::U8)
448+
}
449+
AlgebraicType::Builtin(crate::BuiltinType::I16) => de_array(deserializer, ArrayValue::I16),
450+
AlgebraicType::Builtin(crate::BuiltinType::U16) => de_array(deserializer, ArrayValue::U16),
451+
AlgebraicType::Builtin(crate::BuiltinType::I32) => de_array(deserializer, ArrayValue::I32),
452+
AlgebraicType::Builtin(crate::BuiltinType::U32) => de_array(deserializer, ArrayValue::U32),
453+
AlgebraicType::Builtin(crate::BuiltinType::I64) => de_array(deserializer, ArrayValue::I64),
454+
AlgebraicType::Builtin(crate::BuiltinType::U64) => de_array(deserializer, ArrayValue::U64),
455+
AlgebraicType::Builtin(crate::BuiltinType::I128) => de_array(deserializer, ArrayValue::I128),
456+
AlgebraicType::Builtin(crate::BuiltinType::U128) => de_array(deserializer, ArrayValue::U128),
457+
AlgebraicType::Builtin(crate::BuiltinType::F32) => de_array(deserializer, ArrayValue::F32),
458+
AlgebraicType::Builtin(crate::BuiltinType::F64) => de_array(deserializer, ArrayValue::F64),
459+
AlgebraicType::Builtin(crate::BuiltinType::String) => de_array(deserializer, ArrayValue::String),
458460
};
459461
}
460462
}

0 commit comments

Comments
 (0)