Update dependencies

Cargo.toml

@@ -51,37 +51,32 @@ ofdb-webserver    = "=0.0.0"
 
 ofdb-entities     =  "*"
 
-anyhow = "1.0.69"
-clap = { version = "4.1.6", features = ["cargo", "derive"] }
-dotenvy = "0.15.6"
+anyhow = "1.0.70"
+clap = { version = "4.1.13", features = ["cargo", "derive"] }
+dotenvy = "0.15.7"
 duration-str = { version = "0.5.0", default-features = false, features = ["serde"] }
 env_logger = "0.10.0"
 log = "0.4.17"
-serde = { version = "1.0.152", features = ["derive"] }
+serde = { version = "1.0.158", features = ["derive"] }
 time = "0.3.20"
-tokio = "1.25.0"
-toml = "0.5.11"
+tokio = "1.26.0"
+toml = "0.7.3"
 
 [patch.crates-io.maud]
 # TODO: use v0.25.0 as soon as it's published
 git = "https://github.com/slowtec/maud"
-branch = "rocket-0.5.0-rc.2"
+branch = "rocket-0.5.0-rc.3"
 
 [patch.crates-io.rocket_cors]
 # TODO: use v0.6.0 as soon as it's published
-git = "https://github.com/lawliet89/rocket_cors.git"
-branch = "master"
+git = "https://github.com/flosse/rocket_cors.git"
+branch = "update-to-rocket-05rc3"
 
 [patch.crates-io.geocoding]
 # TODO: use upstream as soon as https://github.com/georust/geocoding/pull/58 is merged.
 git = "https://github.com/slowtec/geocoding"
 branch = "remove-reqwest-default-tls-feature"
 
-[patch.crates-io.rocket]
-# TODO: use upstream as soon as v0.5 is published
-git = "https://github.com/slowtec/Rocket"
-branch = "fixes"
-
 [dev-dependencies]
 rand = "0.8.5"
 ofdb-entities = { version = "*", features = ["builders"] }

ofdb-application/Cargo.toml

@@ -9,13 +9,13 @@ ofdb-core = "=0.0.0"
 ofdb-db-sqlite = "=0.0.0" # TODO: remove
 ofdb-entities = { version = "0.12.0", features = ["url"] }
 
-anyhow = "1.0.69"
-csv = "1.2.0"
+anyhow = "1.0.70"
+csv = "1.2.1"
 log = "0.4.17"
 pwhash = "1.0.0"
 r2d2 = ">=0.8.10,<0.9" # TODO: remove
-serde_json = "1.0.93"
-thiserror = "1.0.38"
+serde_json = "1.0.94"
+thiserror = "1.0.40"
 time = "0.3.20"
 
 [dev-dependencies]

ofdb-boundary/Cargo.toml

@@ -10,7 +10,7 @@ repository.workspace = true
 edition.workspace = true
 
 [dependencies]
-serde = { version = "1.0.152", features = ["derive"] }
+serde = { version = "1.0.158", features = ["derive"] }
 time = { version = "0.3.20", features = ["serde"] }
 
 [dependencies.ofdb-entities]
@@ -19,7 +19,7 @@ path = "../ofdb-entities"
 optional = true
 
 [dependencies.thiserror]
-version = "1.0.38"
+version = "1.0.40"
 optional = true
 
 [features]

ofdb-core/Cargo.toml

@@ -10,18 +10,18 @@ publish = false
 ofdb-entities = { version = "0.12.0", features = ["url"] }
 
 # External dependencies
-anyhow = "1.0.69"
+anyhow = "1.0.70"
 fast_chemail = "0.9.6"
 lazy_static = "1.4.0"
 log = "0.4.17"
 passwords = "3.1.12"
-regex = "1.7.1"
-thiserror = "1.0.38"
+regex = "1.7.2"
+thiserror = "1.0.40"
 time = "0.3.20"
 url = "2.3.1"
 
 [dev-dependencies]
-brunch = "0.3.7"
+brunch = "0.4.0"
 ofdb-entities = { version = "*", features = ["builders"] }
 time = "0.3.20"
 

ofdb-db-sqlite/Cargo.toml

@@ -5,7 +5,7 @@ edition = "2021"
 publish = false
 
 [dependencies]
-anyhow = "1.0.69"
+anyhow = "1.0.70"
 log = "0.4.17"
 num-traits = "0.2.15"
 diesel = { version = "2.0.3", features = ["sqlite", "r2d2"] }

ofdb-db-tantivy/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2021"
 [dependencies]
 ofdb-core = "=0.0.0"
 
-anyhow = "1.0.69"
+anyhow = "1.0.70"
 log = "0.4.17"
 num-traits = "0.2.15"
 parking_lot = "0.12.1"

ofdb-entities/Cargo.toml

@@ -18,7 +18,7 @@ pwhash = "1.0.0"
 uuid = { version = "1.3.0", features = ["v4"] }
 url = { version = "2.3.1", optional = true }
 strum = { version = "0.24.1", features = ["derive"] }
-thiserror = "1.0.38"
+thiserror = "1.0.40"
 time = { version = "0.3.20", features = ["formatting", "macros"] }
 
 [features]

ofdb-frontend-api/Cargo.toml

@@ -11,8 +11,8 @@ repository.workspace = true
 [dependencies]
 gloo-net = "0.2.6"
 percent-encoding = "2.2.0"
-serde = "1.0.156"
-thiserror = "1.0.39"
+serde = "1.0.158"
+thiserror = "1.0.40"
 
 [dependencies.ofdb-boundary]
 version = "0.12.2"

ofdb-gateways/Cargo.toml

@@ -9,23 +9,23 @@ publish = false
 ofdb-core = "=0.0.0"
 ofdb-entities = "0.12.0"
 
-anyhow = "1.0.69"
-askama = "0.11.1"
+anyhow = "1.0.70"
+askama = "0.12.0"
 fast_chemail = "0.9.6"
 itertools = "0.10.5"
-jfs = "0.8.0"
+jfs = "0.9.0"
 log = "0.4.17"
 quoted_printable = "0.4.7"
-serde = { version = "1.0.152", features = ["derive"] }
+serde = { version = "1.0.158", features = ["derive"] }
 time = { version = "0.3.20", features = ["macros", "formatting", "local-offset"] }
-thiserror = "1.0.38"
+thiserror = "1.0.40"
 
 [dependencies.geocoding]
 version = "0.4.0"
 default-features = false
 features = ["rustls-tls"]
 
 [dependencies.reqwest]
-version = "0.11.14"
+version = "0.11.15"
 default-features = false
 features = ["blocking", "rustls-tls", "json"]

ofdb-webserver/Cargo.toml

@@ -13,34 +13,34 @@ ofdb-db-sqlite = "=0.0.0" # TODO: remove
 ofdb-db-tantivy = "=0.0.0" # TODO: remove
 ofdb-entities = { version = "0.12.0", features = ["url"] }
 
-anyhow = "1.0.69"
+anyhow = "1.0.70"
 base64 = { version = "0.21.0", optional = true }
 captcha = "0.0.9"
-chrono = { version = "0.4.23", default-features = false }
-csv = "1.2.0"
+chrono = { version = "0.4.24", default-features = false }
+csv = "1.2.1"
 icalendar = "0.15.4"
-jsonwebtoken = { version = "8.2.0", optional = true }
+jsonwebtoken = { version = "8.3.0", optional = true }
 lazy_static = "1.4.0"
 log = "0.4.17"
 maud = { version = "0.24.0", optional = true, features = ["rocket"] }
 num-traits = "0.2.15"
 parking_lot = "0.12.1"
 r2d2 = "0.8.10"
 rand = { version = "0.8.5", optional = true }
-rust-embed = "6.4.2"
-rocket = { version = "0.5.0-rc.2", features = ["secrets", "json"] }
+rust-embed = "6.6.0"
+rocket = { version = "0.5.0-rc.3", features = ["secrets", "json"] }
 rocket_cors = "0.6.0-alpha1"
-serde = { version = "1.0.152", features = ["derive"] }
-serde_json = "1.0.93"
+serde = { version = "1.0.158", features = ["derive"] }
+serde_json = "1.0.94"
 time = { version = "0.3.20", features = ["macros", "formatting"] }
-thiserror = "1.0.38"
+thiserror = "1.0.40"
 uuid = { version = "1.3.0", features = ["v4"] }
 
 [dev-dependencies]
 ofdb-entities = { version = "0.12.0", features = ["url", "builders"] }
 
 [build-dependencies]
-walkdir = "2.3.2"
+walkdir = "2.3.3"
 
 [features]
 default = ["frontend", "email", "clearance", "cookies", "jwt"]

src/config/raw.rs

@@ -2,7 +2,7 @@ use duration_str::{deserialize_duration, deserialize_option_duration};
 use serde::{Deserialize, Serialize};
 use std::{collections::HashSet, path::PathBuf, time::Duration};
 
-const DEFAULT_CONFIG_FILE: &[u8] = include_bytes!("openfairdb.default.toml");
+const DEFAULT_CONFIG_FILE: &str = include_str!("openfairdb.default.toml");
 
 #[derive(Deserialize)]
 #[serde(rename_all = "kebab-case")]
@@ -18,7 +18,7 @@ pub struct Config {
 
 impl Default for Config {
     fn default() -> Self {
-        let cfg: Self = toml::from_slice(DEFAULT_CONFIG_FILE).expect("Default configuration");
+        let cfg: Self = toml::from_str(DEFAULT_CONFIG_FILE).expect("Default configuration");
         cfg
     }
 }
@@ -198,7 +198,7 @@ mod tests {
 
     #[test]
     fn parse_default_config_from_file() {
-        let cfg: Config = toml::from_slice(DEFAULT_CONFIG_FILE).unwrap();
+        let cfg: Config = toml::from_str(DEFAULT_CONFIG_FILE).unwrap();
         assert!(cfg.db.is_some());
         assert!(cfg.webserver.is_some());
         assert!(cfg.reminders.is_some());