diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 13348a6a..38d994e7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -23,7 +23,7 @@ jobs: - name: Install toolchain uses: actions-rs/toolchain@v1 with: - toolchain: "1.59.0" # MSRV + toolchain: "1.60.0" # MSRV target: x86_64-unknown-linux-musl profile: minimal override: true @@ -201,7 +201,7 @@ jobs: fail-fast: false # Continue other jobs if one fails to help filling the cache matrix: toolchain: - - "1.59.0" # MSRV + - "1.60.0" # MSRV - stable - beta - nightly diff --git a/Cargo.lock b/Cargo.lock index 71e36219..6df5e2d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,9 +105,9 @@ checksum = "bb07d2053ccdbe10e2af2995a2f116c1330396493dc1269f6a91d0ae82e19704" [[package]] name = "argon2" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27e27b63e4a34caee411ade944981136fdfa535522dc9944d6700196cbd899f" +checksum = "db4ce4441f99dbd377ca8a8f57b698c44d0d6e712d8329b5040da5a64aa1ce73" dependencies = [ "base64ct", "blake2", @@ -523,13 +523,14 @@ dependencies = [ [[package]] name = "axum-extra" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4a22e494aab08f7fb9e9b462e49e4c1637dd9a4bfa4250e9addfdbafc1a022" +checksum = "67512287c1ae2a58c3b8f86f99f53ae79e33e2015c1560f506c1d2951868dd7a" dependencies = [ "axum", "bytes 1.1.0", "cookie", + "futures-util", "http", "mime", "pin-project-lite", @@ -542,9 +543,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cae774e664fd50bf80c9a7132d64ff70be3232a192ff4ba5619c3f72b9b4711f" +checksum = "6293dae2ec708e679da6736e857cf8532886ef258e92930f38279c12641628b8" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -2869,7 +2870,7 @@ checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225" [[package]] name = "opa-wasm" version = "0.1.0" -source = "git+https://github.com/matrix-org/rust-opa-wasm.git#a4385b5eed33f3c89c367f890a76b8839c6dac7b" +source = "git+https://github.com/matrix-org/rust-opa-wasm.git#607e94cd250597d2dbbb0194f3cb82632d8e48ec" dependencies = [ "anyhow", "base64", @@ -3546,9 +3547,9 @@ dependencies = [ [[package]] name = "regalloc2" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d37148700dbb38f994cd99a1431613057f37ed934d7e4d799b7ab758c482461" +checksum = "4a8d23b35d7177df3b9d31ed8a9ab4bf625c668be77a319d4f5efd4a5257701c" dependencies = [ "fxhash", "log", diff --git a/clippy.toml b/clippy.toml index 64b5fef2..16caf02e 100644 --- a/clippy.toml +++ b/clippy.toml @@ -1 +1 @@ -msrv = "1.59.0" +msrv = "1.60.0" diff --git a/crates/axum-utils/Cargo.toml b/crates/axum-utils/Cargo.toml index c1b89893..611c10d9 100644 --- a/crates/axum-utils/Cargo.toml +++ b/crates/axum-utils/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] async-trait = "0.1.56" axum = { version = "0.5.9", features = ["headers"] } -axum-extra = { version = "0.3.4", features = ["cookie-private"] } +axum-extra = { version = "0.3.5", features = ["cookie-private"] } bincode = "1.3.3" chrono = "0.4.19" data-encoding = "2.3.2" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index a20446df..0f3ac0b2 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -17,7 +17,7 @@ hyper = { version = "0.14.19", features = ["full"] } serde_yaml = "0.8.24" serde_json = "1.0.81" url = "2.2.2" -argon2 = { version = "0.4.0", features = ["password-hash"] } +argon2 = { version = "0.4.1", features = ["password-hash"] } reqwest = { version = "0.11.11", features = ["rustls-tls"], default-features = false, optional = true } watchman_client = "0.8.0" atty = "0.2.14" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index f6ffb224..9b4a01f2 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -21,8 +21,8 @@ hyper = { version = "0.14.19", features = ["full"] } tower = "0.4.13" tower-http = { version = "0.3.4", features = ["cors"] } axum = "0.5.9" -axum-macros = "0.2.2" -axum-extra = { version = "0.3.4", features = ["cookie-private"] } +axum-macros = "0.2.3" +axum-extra = { version = "0.3.5", features = ["cookie-private"] } # Emails lettre = { version = "0.10.0-rc.7", default-features = false, features = ["builder"] } @@ -37,7 +37,7 @@ serde_json = "1.0.81" serde_urlencoded = "0.7.1" # Password hashing -argon2 = { version = "0.4.0", features = ["password-hash"] } +argon2 = { version = "0.4.1", features = ["password-hash"] } # Crypto, hashing and signing stuff rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 5bd4fd1f..e40ec00b 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -16,7 +16,7 @@ anyhow = "1.0.58" tracing = "0.1.35" # Password hashing -argon2 = { version = "0.4.0", features = ["password-hash"] } +argon2 = { version = "0.4.1", features = ["password-hash"] } password-hash = { version = "0.4.1", features = ["std"] } rand = "0.8.5" url = { version = "2.2.2", features = ["serde"] }