diff --git a/deltachat_derive/src/lib.rs b/deltachat_derive/src/lib.rs index 672c43943..663c3ec3d 100644 --- a/deltachat_derive/src/lib.rs +++ b/deltachat_derive/src/lib.rs @@ -15,14 +15,14 @@ pub fn sqlx_derive(input: TokenStream) -> TokenStream { let gen = quote! { impl<'q> sqlx::encode::Encode<'q, sqlx::sqlite::Sqlite> for #name { - fn encode_by_ref(&self, buf: &mut Vec>) -> sqlx::encode::IsNull{ + fn encode_by_ref(&self, buf: &mut Vec>) -> sqlx::encode::IsNull { num_traits::ToPrimitive::to_i32(self).expect("invalid type").encode(buf) } } impl<'de> sqlx::decode::Decode<'de, sqlx::sqlite::Sqlite> for #name { - fn decode(value: sqlx::sqlite::SqliteValueRef) -> std::result::Result { + fn decode(value: sqlx::sqlite::SqliteValueRef) -> std::result::Result> { let raw: i32 = sqlx::decode::Decode::decode(value)?; Ok(num_traits::FromPrimitive::from_i32(raw).unwrap_or_default()) diff --git a/src/chat.rs b/src/chat.rs index ac68a4c92..1f919871a 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -2172,7 +2172,7 @@ impl sqlx::encode::Encode<'_, sqlx::sqlite::Sqlite> for MuteDuration { impl<'de> sqlx::decode::Decode<'de, sqlx::sqlite::Sqlite> for MuteDuration { fn decode( value: sqlx::sqlite::SqliteValueRef, - ) -> std::result::Result { + ) -> std::result::Result> { // Negative values other than -1 should not be in the // database. If found they'll be NotMuted. let raw: i32 = sqlx::decode::Decode::decode(value)?; diff --git a/src/sql/migrations.rs b/src/sql/migrations.rs index a846ed59a..01fc7a4df 100644 --- a/src/sql/migrations.rs +++ b/src/sql/migrations.rs @@ -364,14 +364,15 @@ ALTER TABLE chats ADD COLUMN muted_until INTEGER DEFAULT 0; UPDATE chats SET grpid='' WHERE type=100; "#, ) - .await?; + .await?; migrate( 64, r#" ALTER TABLE msgs ADD COLUMN error TEXT DEFAULT ''; "#, - ).await?; + ) + .await?; Ok(()) }