diff --git a/CHANGELOG.md b/CHANGELOG.md index 4db6cca..41674a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Ignore errors when importing activities from outbox. - Make activity limit in outbox fetcher adjustable. +- Updated actix to latest version. MSRV changed to 1.57. ### Fixed diff --git a/Cargo.lock b/Cargo.lock index 1896128..cf2ab4a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -59,15 +59,15 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "0070905b2c4a98d184c4e81025253cb192aa8a73827553f38e9410801ceb35bb" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", + "ahash", "base64 0.21.0", "bitflags", "brotli", @@ -142,7 +142,7 @@ dependencies = [ "futures-util", "mio", "num_cpus", - "socket2 0.4.9", + "socket2", "tokio", "tracing", ] @@ -183,7 +183,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.7.6", + "ahash", "bytes", "bytestring", "cfg-if", @@ -204,7 +204,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2 0.4.9", + "socket2", "time", "url 2.3.1", ] @@ -253,18 +253,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" -dependencies = [ - "cfg-if", - "getrandom 0.2.9", - "once_cell", - "version_check", -] - [[package]] name = "aho-corasick" version = "1.0.1" @@ -1279,7 +1267,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "socket2 0.4.9", + "socket2", "tokio", "tower-service", "tracing", @@ -2719,16 +2707,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "socket2" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d283f86695ae989d1e18440a943880967156325ba025f05049946bff47bcc2b" -dependencies = [ - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "spin" version = "0.5.2" @@ -2911,32 +2889,33 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.27.0" +version = "1.20.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0de47a4eecbe11f498978a9b29d792f0d2692d1dd003650c24c76510e3bc001" +checksum = "eb78f30e4b41e98ca4cce5acb51168a033839a7af9e42b380355808e14e98ee0" dependencies = [ "autocfg 1.1.0", "bytes", "libc", + "memchr", "mio", "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2", "tokio-macros", - "windows-sys 0.45.0", + "winapi", ] [[package]] name = "tokio-macros" -version = "2.0.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a573bdc87985e9d6ddeed1b3d864e8a302c847e40d647746df2f1de209d1ce" +checksum = "d266c00fde287f55d3f1c3e96c500c362a2b8c695076ec180f27918820bc6df8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 1.0.109", ] [[package]] @@ -2951,9 +2930,9 @@ dependencies = [ [[package]] name = "tokio-postgres" -version = "0.7.8" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e89f6234aa8fd43779746012fcf53603cdb91fdd8399aa0de868c2d56b6dde1" +checksum = "29a12c1b3e0704ae7dfc25562629798b29c72e6b1d0a681b6f29ab4ae5e7f7bf" dependencies = [ "async-trait", "byteorder", @@ -2968,7 +2947,7 @@ dependencies = [ "pin-project-lite", "postgres-protocol", "postgres-types", - "socket2 0.5.2", + "socket2", "tokio", "tokio-util", ] @@ -2987,9 +2966,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.7" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5427d89453009325de0d8f342c9490009f76e999cb7672d77e46267448f7e6b2" +checksum = "cc463cd8deddc3770d20f9852143d50bf6094e640b485cb2e189a2099085ff45" dependencies = [ "bytes", "futures-core", diff --git a/Cargo.toml b/Cargo.toml index e3a515d..73281fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,7 @@ description = "Federated micro-blogging platform and content subscription servic license = "AGPL-3.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.57" publish = false default-run = "mitra" @@ -31,9 +31,9 @@ mitra-models = { path = "mitra-models" } mitra-utils = { path = "mitra-utils" } # Used to handle incoming HTTP requests -actix-cors = "0.6.2" +actix-cors = "0.6.4" actix-files = "0.6.2" -actix-web = "4.1.0" +actix-web = "4.3.1" actix-web-httpauth = "0.8.0" # Used for catching errors anyhow = "1.0.58" @@ -68,7 +68,7 @@ siwe = "0.4.0" # Used for creating error types thiserror = "1.0.37" # Async runtime -tokio = { version = "1.20.4", features = ["macros"] } +tokio = { version = "=1.20.4", features = ["macros"] } # Used to work with URLs url = "2.2.2" # Used to work with UUIDs diff --git a/README.md b/README.md index aa2eb47..71e9677 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ Web client: ## Requirements -- Rust 1.56+ (when building from source) +- Rust 1.57+ (when building from source) - PostgreSQL 12+ Optional: diff --git a/mitra-cli/Cargo.toml b/mitra-cli/Cargo.toml index 49039b9..1d40fb8 100644 --- a/mitra-cli/Cargo.toml +++ b/mitra-cli/Cargo.toml @@ -3,7 +3,7 @@ name = "mitra-cli" version = "1.21.0" license = "AGPL-3.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.57" [[bin]] name = "mitractl" diff --git a/mitra-config/Cargo.toml b/mitra-config/Cargo.toml index 9f5b881..8d5f9c7 100644 --- a/mitra-config/Cargo.toml +++ b/mitra-config/Cargo.toml @@ -3,7 +3,7 @@ name = "mitra-config" version = "1.21.0" license = "AGPL-3.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.57" [dependencies] mitra-utils = { path = "../mitra-utils" } diff --git a/mitra-models/Cargo.toml b/mitra-models/Cargo.toml index 28a3f17..af80ea3 100644 --- a/mitra-models/Cargo.toml +++ b/mitra-models/Cargo.toml @@ -3,7 +3,7 @@ name = "mitra-models" version = "1.21.0" license = "AGPL-3.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.57" [dependencies] mitra-utils = { path = "../mitra-utils" } diff --git a/mitra-utils/Cargo.toml b/mitra-utils/Cargo.toml index 9670939..0f8f679 100644 --- a/mitra-utils/Cargo.toml +++ b/mitra-utils/Cargo.toml @@ -3,7 +3,7 @@ name = "mitra-utils" version = "1.21.0" license = "AGPL-3.0" edition = "2021" -rust-version = "1.56" +rust-version = "1.57" [dependencies] # Used for HTML sanitization