Skip to content

Commit 0cfd5a4

Browse files
sjuddConvex, Inc.
authored andcommitted
Yet more unnecessary fallible type conversions (#24699)
GitOrigin-RevId: 585f24a57bfe015c830572a2173123ae3870b324
1 parent 39eeffe commit 0cfd5a4

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

crates/common/src/schemas/validator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1131,7 +1131,7 @@ mod tests {
11311131
Validator::Boolean => assert_val!(false),
11321132
Validator::String => assert_val!(""),
11331133
Validator::Bytes => ConvexValue::Bytes(vec![1, 2, 3].try_into()?),
1134-
Validator::Literal(literal) => literal.try_into()?,
1134+
Validator::Literal(literal) => literal.into(),
11351135
Validator::Array(v) => {
11361136
assert_val!([value_from_validator(*v, id_generator)?])
11371137
},
@@ -1516,7 +1516,7 @@ mod tests {
15161516
// generate an ID so it's in the table mapping
15171517
id_generator.generate(&table1);
15181518
let document_id = id_generator.generate(&table2);
1519-
let id_v6 = DocumentIdV6::try_from(document_id)?;
1519+
let id_v6 = DocumentIdV6::from(document_id);
15201520
let value: ConvexValue = id_v6.into();
15211521

15221522
let err = id_validator

crates/common/src/shapes/tests.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,11 +95,11 @@ fn test_id_strings() -> anyhow::Result<()> {
9595
// Create three IDs from three different tables
9696
let message_id: DocumentIdV6 = id_generator
9797
.generate(&TableName::from_str("messages")?)
98-
.try_into()?;
98+
.into();
9999
let deleted1_table = TableName::from_str("deleted1")?;
100100
let deleted2_table = TableName::from_str("deleted2")?;
101-
let deleted1_id: DocumentIdV6 = id_generator.generate(&deleted1_table).try_into()?;
102-
let deleted2_id: DocumentIdV6 = id_generator.generate(&deleted2_table).try_into()?;
101+
let deleted1_id: DocumentIdV6 = id_generator.generate(&deleted1_table).into();
102+
let deleted2_id: DocumentIdV6 = id_generator.generate(&deleted2_table).into();
103103

104104
// Delete two of the tables
105105
let deleted1_table_id = id_generator.id(&deleted1_table)?;

crates/convex/examples/convex_chat_client.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,8 @@ async fn main() -> anyhow::Result<()> {
142142
.mutation(
143143
"messages:send",
144144
btreemap! {
145-
"body".to_string() => line.try_into()?,
146-
"author".to_string() => sender.clone().try_into()?
145+
"body".to_string() => line.into(),
146+
"author".to_string() => sender.clone().into(),
147147
},
148148
)
149149
.await?;

crates/convex/src/value/json/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl TryFrom<JsonValue> for Value {
6161
.context("Arbitrary precision JSON integers unsupported")?;
6262
Value::from(n)
6363
},
64-
JsonValue::String(s) => Self::try_from(s)?,
64+
JsonValue::String(s) => Self::from(s),
6565
JsonValue::Array(arr) => {
6666
let mut out = Vec::with_capacity(arr.len());
6767
for a in arr {

crates/indexing/src/tests.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ fn test_metadata_index_updates() -> anyhow::Result<()> {
408408
},
409409
DatabaseIndexUpdate {
410410
index_id: by_author,
411-
key: IndexKey::new(vec![33.try_into()?], doc_id.into()),
411+
key: IndexKey::new(vec![33.into()], doc_id.into()),
412412
value: DatabaseIndexValue::NonClustered(doc_id),
413413
is_system_index: false,
414414
},
@@ -449,7 +449,7 @@ fn test_metadata_index_updates() -> anyhow::Result<()> {
449449
// will become quite complicated. We can reconsider in the long run.
450450
DatabaseIndexUpdate {
451451
index_id: by_author,
452-
key: IndexKey::new(vec![33.try_into()?], doc_id.into()),
452+
key: IndexKey::new(vec![33.into()], doc_id.into()),
453453
value: DatabaseIndexValue::NonClustered(doc_id),
454454
is_system_index: false,
455455
},
@@ -492,7 +492,7 @@ fn test_metadata_index_updates() -> anyhow::Result<()> {
492492
},
493493
DatabaseIndexUpdate {
494494
index_id: by_author,
495-
key: IndexKey::new(vec![33.try_into()?], doc_id.into()),
495+
key: IndexKey::new(vec![33.into()], doc_id.into()),
496496
value: DatabaseIndexValue::NonClustered(doc_id),
497497
is_system_index: false,
498498
},
@@ -523,7 +523,7 @@ fn test_metadata_index_updates() -> anyhow::Result<()> {
523523
},
524524
DatabaseIndexUpdate {
525525
index_id: by_author,
526-
key: IndexKey::new(vec![33.try_into()?], doc_id.into()),
526+
key: IndexKey::new(vec![33.into()], doc_id.into()),
527527
value: DatabaseIndexValue::Deleted,
528528
is_system_index: false,
529529
},

crates/keybroker/src/broker.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -991,7 +991,7 @@ mod tests {
991991
let mut journal_with_cursor = QueryJournal::new();
992992
journal_with_cursor.end_cursor = Some(Cursor {
993993
position: CursorPosition::After(
994-
IndexKey::new(vec![100.try_into()?], DeveloperDocumentId::min()).into_bytes(),
994+
IndexKey::new(vec![100.into()], DeveloperDocumentId::min()).into_bytes(),
995995
),
996996
query_fingerprint: query.fingerprint(&IndexedFields::creation_time())?,
997997
});
@@ -1053,7 +1053,7 @@ mod tests {
10531053

10541054
#[test]
10551055
fn test_identity_proto_roundtrips(identity in any::<Identity>()) {
1056-
let proto: pb::convex_identity::Identity = identity.clone().try_into().unwrap();
1056+
let proto: pb::convex_identity::Identity = identity.clone().into();
10571057
let roundtripped = Identity::from_proto_unchecked(proto).unwrap();
10581058
assert_eq!(identity, roundtripped);
10591059
}
@@ -1062,8 +1062,7 @@ mod tests {
10621062
fn test_admin_identity_proto_roundtrips(admin_identity in any::<AdminIdentity>()) {
10631063
let proto: pb::convex_identity::AdminIdentity = admin_identity
10641064
.clone()
1065-
.try_into()
1066-
.unwrap();
1065+
.into();
10671066
let roundtripped = AdminIdentity::from_proto_unchecked(proto).unwrap();
10681067
assert_eq!(admin_identity, roundtripped);
10691068
}

0 commit comments

Comments
 (0)