Update dependencies.

There are still a few dependencies left to update, but these updates
require additional code changes.

Cargo.toml

@@ -13,7 +13,3 @@ members = [
   opt-level = 'z'
   lto = true
   codegen-units = 1
-
-[patch.crates-io]
-# Remove if diesel-async > 0.4.1
-diesel-async = { git = "https://github.com/weiznich/diesel_async.git", rev = "017ebe2fb7a2709ab5db92148dea5ce812a35e09" }

api/rust/Cargo.toml

@@ -25,11 +25,11 @@
     "codegen",
     "prost",
   ], default-features = false, optional = true }
-  tokio = { version = "1.37", features = ["macros"], optional = true }
+  tokio = { version = "1.38", features = ["macros"], optional = true }
   pbjson = { version = "0.6", optional = true }
   pbjson-types = { version = "0.6", optional = true }
   serde = { version = "1.0", optional = true }
-  diesel = { version = "2.1", features = ["postgres_backend"], optional = true }
+  diesel = { version = "2.2", features = ["postgres_backend"], optional = true }
 
 [build-dependencies]
   tonic-build = { version = "0.11", features = [

backend/Cargo.toml

@@ -19,7 +19,7 @@
     "rustls-tls",
   ], default-features = false }
   chrono = { version = "0.4", features = ["serde"] }
-  tokio = { version = "1.36", features = ["macros"] }
+  tokio = { version = "1.38", features = ["macros"] }
   chirpstack_api = { path = "../api/rust", default-features = false, features = [
     "json",
   ] }

chirpstack-integration/Cargo.toml

@@ -23,7 +23,7 @@
   ], default-features = true }
   async-trait = "0.1.79"
   serde = { version = "1.0", features = ["derive"] }
-  tokio = { version = "1.36", features = ["macros", "rt-multi-thread"] }
+  tokio = { version = "1.38", features = ["macros", "rt-multi-thread"] }
-  lazy_static = "1.4"
+  lazy_static = "1.5"
   serde_json = "1.0"
   toml = "0.8"

chirpstack/Cargo.toml

@@ -20,11 +20,11 @@
   serde_urlencoded = "0.7"
   humantime-serde = "1.1"
   toml = "0.8"
-  handlebars = "5.1"
+  handlebars = "6.0"
 
   # Database
   email_address = "0.2"
-  diesel = { version = "2.1", features = [
+  diesel = { version = "2.2", features = [
     "chrono",
     "uuid",
     "serde_json",
@@ -32,8 +32,8 @@
     "64-column-tables",
     "postgres_backend",
   ] }
-  diesel_migrations = { version = "2.1" }
+  diesel_migrations = { version = "2.2" }
-  diesel-async = { version = "0.4", features = [
+  diesel-async = { version = "0.5", features = [
     "deadpool",
     "postgres",
     "async-connection-wrapper",
@@ -91,7 +91,7 @@
   tonic = "0.11"
   tonic-web = "0.11"
   tonic-reflection = "0.11"
-  tokio = { version = "1.36", features = ["macros", "rt-multi-thread"] }
+  tokio = { version = "1.38", features = ["macros", "rt-multi-thread"] }
   tokio-stream = "0.1"
   prost-types = "0.12"
   prost = "0.12"
@@ -105,7 +105,7 @@
   futures-util = "0.3"
   http = "0.2"
   http-body = "0.4"
-  rust-embed = "8.3"
+  rust-embed = "8.5"
   mime_guess = "2.0"
   tower-http = { version = "0.4", features = ["trace", "auth"] }
 
@@ -144,8 +144,8 @@
   ] }
 
   # Misc
-  lazy_static = "1.4"
+  lazy_static = "1.5"
-  uuid = { version = "1.8", features = ["v4", "serde"] }
+  uuid = { version = "1.10", features = ["v4", "serde"] }
   chrono = "0.4"
   async-trait = "0.1"
   aes = "0.8"
@@ -160,7 +160,7 @@
 # Development and testing
 [dev-dependencies]
   httpmock = "0.7.0"
-  bytes = "1.5"
+  bytes = "1.6"
   dotenv = "0.15"
 
 [features]

chirpstack/src/codec/mod.rs

@@ -35,8 +35,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(Codec::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }
 

chirpstack/src/storage/application.rs

@@ -124,8 +124,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(IntegrationKind::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }
 

chirpstack/src/storage/device.rs

@@ -57,8 +57,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(DeviceClass::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }
 

chirpstack/src/storage/fields.rs

@@ -142,8 +142,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(MulticastGroupSchedulingType::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }
 

lrwn/Cargo.toml

@@ -16,14 +16,14 @@
   cmac = { version = "0.7", optional = true }
   aes = { version = "0.8", optional = true }
   serde = { version = "1.0", features = ["derive"], optional = true }
-  diesel = { version = "2.1", features = ["postgres_backend"], optional = true }
+  diesel = { version = "2.2", features = ["postgres_backend"], optional = true }
 
   # Error handling
   thiserror = "1.0"
   anyhow = "1.0"
 
   # Misc
-  lazy_static = "1.4"
+  lazy_static = "1.5"
 
 [features]
   default = []

lrwn/src/region/mod.rs

@@ -64,8 +64,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(CommonName::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }
 
@@ -178,8 +178,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(Revision::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }
 
@@ -263,8 +263,8 @@ where
     *const str: deserialize::FromSql<Text, DB>,
 {
     fn from_sql(value: <DB as Backend>::RawValue<'_>) -> deserialize::Result<Self> {
-        let string = String::from_sql(value)?;
+        let string = <*const str>::from_sql(value)?;
-        Ok(MacVersion::from_str(&string)?)
+        Ok(Self::from_str(unsafe { &*string })?)
     }
 }