From 1377e09dbe7d254a0089f2da50a89d3f887715b6 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Tue, 4 Jan 2022 22:35:18 +0100 Subject: [PATCH] Upgrade dependencies --- Cargo.lock | 151 ++------------------------------- crates/cli/Cargo.toml | 14 +-- crates/config/Cargo.toml | 10 +-- crates/data-model/Cargo.toml | 2 +- crates/handlers/Cargo.toml | 12 +-- crates/jose/Cargo.toml | 8 +- crates/oauth2-types/Cargo.toml | 6 +- crates/storage/Cargo.toml | 8 +- crates/tasks/Cargo.toml | 6 +- crates/templates/Cargo.toml | 8 +- crates/warp-utils/Cargo.toml | 14 +-- 11 files changed, 53 insertions(+), 186 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c8803513..80636481 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -193,12 +193,6 @@ dependencies = [ "rustc-demangle", ] -[[package]] -name = "base-x" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" - [[package]] name = "base64" version = "0.10.1" @@ -484,19 +478,13 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4c78c047431fee22c1a7bb92e00ad095a02a983affe4d8a72e2a2c62c1b94f3" -[[package]] -name = "const_fn" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbdcdcb6d86f71c5e97409ad45898af11cbc995b4ee8112d59095a28d376c935" - [[package]] name = "cookie" -version = "0.15.1" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f1c7727e460397e56abc4bddc1d49e07a1ad78fc98eb2e1c8f032a58a2f80d" +checksum = "94d4706de1b0fa5b132270cddffa8585166037822e260a944fe161acd137ca05" dependencies = [ - "time 0.2.27", + "time 0.3.5", "version_check 0.9.4", ] @@ -747,12 +735,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "discard" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" - [[package]] name = "dotenv" version = "0.15.0" @@ -1563,7 +1545,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "serde_with", - "sha2 0.9.8", + "sha2 0.10.0", "sqlx", "thiserror", "tokio", @@ -2373,12 +2355,6 @@ dependencies = [ "version_check 0.9.4", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" version = "1.0.36" @@ -2683,15 +2659,6 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - [[package]] name = "rustls" version = "0.19.1" @@ -2869,21 +2836,6 @@ dependencies = [ "libc", ] -[[package]] -name = "semver" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - [[package]] name = "serde" version = "1.0.133" @@ -3015,12 +2967,6 @@ dependencies = [ "opaque-debug 0.3.0", ] -[[package]] -name = "sha1" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" - [[package]] name = "sha2" version = "0.9.8" @@ -3233,64 +3179,6 @@ dependencies = [ "tokio-rustls 0.22.0", ] -[[package]] -name = "standback" -version = "0.2.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff" -dependencies = [ - "version_check 0.9.4", -] - -[[package]] -name = "stdweb" -version = "0.4.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" -dependencies = [ - "discard", - "rustc_version", - "stdweb-derive", - "stdweb-internal-macros", - "stdweb-internal-runtime", - "wasm-bindgen", -] - -[[package]] -name = "stdweb-derive" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" -dependencies = [ - "proc-macro2", - "quote", - "serde", - "serde_derive", - "syn", -] - -[[package]] -name = "stdweb-internal-macros" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" -dependencies = [ - "base-x", - "proc-macro2", - "quote", - "serde", - "serde_derive", - "serde_json", - "sha1", - "syn", -] - -[[package]] -name = "stdweb-internal-runtime" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" - [[package]] name = "stringprep" version = "0.1.2" @@ -3474,41 +3362,20 @@ dependencies = [ [[package]] name = "time" -version = "0.2.27" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4752a97f8eebd6854ff91f1c1824cd6160626ac4bd44287f7f4ea2035a02a242" +checksum = "41effe7cfa8af36f439fac33861b66b049edc6f9a32331e2312660529c1c24ad" dependencies = [ - "const_fn", + "itoa 0.4.8", "libc", - "standback", - "stdweb", "time-macros", - "version_check 0.9.4", - "winapi", ] [[package]] name = "time-macros" -version = "0.1.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957e9c6e26f12cb6d0dd7fc776bb67a706312e7299aed74c8dd5b17ebb27e2f1" -dependencies = [ - "proc-macro-hack", - "time-macros-impl", -] - -[[package]] -name = "time-macros-impl" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd3c141a1b43194f3f56a1411225df8646c55781d5f26db825b3d98507eb482f" -dependencies = [ - "proc-macro-hack", - "proc-macro2", - "quote", - "standback", - "syn", -] +checksum = "25eb0ca3468fc0acc11828786797f6ef9aa1555e4a211a60d64cc8e4d1be47d6" [[package]] name = "tinyvec" diff --git a/crates/cli/Cargo.toml b/crates/cli/Cargo.toml index cf23c202..66f8b435 100644 --- a/crates/cli/Cargo.toml +++ b/crates/cli/Cargo.toml @@ -6,24 +6,24 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = { version = "1.14.0", features = ["full"] } -futures = "0.3.18" -anyhow = { version = "1.0.51", features = ["backtrace"] } -clap = { version = "3.0.0-rc.4", features = ["derive"] } +tokio = { version = "1.15.0", features = ["full"] } +futures = "0.3.19" +anyhow = { version = "1.0.52", features = ["backtrace"] } +clap = { version = "3.0.4", features = ["derive"] } dotenv = "0.15.0" schemars = { version = "0.8.8", features = ["url", "chrono"] } tower = { version = "0.4.11", features = ["full"] } tower-http = { version = "0.2.0", features = ["full"] } hyper = { version = "0.14.16", features = ["full"] } -serde_yaml = "0.8.21" +serde_yaml = "0.8.23" warp = "0.3.2" url = "2.2.2" argon2 = { version = "0.3.2", features = ["password-hash"] } -reqwest = { version = "0.11.7", features = ["rustls-tls"], default-features = false, optional = true } +reqwest = { version = "0.11.8", features = ["rustls-tls"], default-features = false, optional = true } watchman_client = "0.7.1" tracing = "0.1.29" -tracing-subscriber = { version = "0.3.3", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.5", features = ["env-filter"] } tracing-opentelemetry = "0.16.0" opentelemetry = { version = "0.16.0", features = ["trace", "metrics", "rt-tokio"] } opentelemetry-http = "0.5.0" diff --git a/crates/config/Cargo.toml b/crates/config/Cargo.toml index 6a74d409..ffa008c8 100644 --- a/crates/config/Cargo.toml +++ b/crates/config/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = { version = "1.14.0", features = [] } +tokio = { version = "1.15.0", features = [] } tracing = { version = "0.1.29", features = ["log"] } async-trait = "0.1.52" thiserror = "1.0.30" -anyhow = "1.0.51" +anyhow = "1.0.52" schemars = { version = "0.8.8", features = ["url", "chrono"] } figment = { version = "0.10.6", features = ["env", "yaml", "test"] } chrono = { version = "0.4.19", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.133", features = ["derive"] } serde_with = { version = "1.11.0", features = ["hex", "chrono"] } -serde_json = "1.0.72" -sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres"] } +serde_json = "1.0.74" +sqlx = { version = "0.5.10", features = ["runtime-tokio-rustls", "postgres"] } rand = "0.8.4" rsa = { git = "https://github.com/sandhose/rsa.git", branch = "bump-pkcs" } diff --git a/crates/data-model/Cargo.toml b/crates/data-model/Cargo.toml index 4c3c9cb7..e9b684f0 100644 --- a/crates/data-model/Cargo.toml +++ b/crates/data-model/Cargo.toml @@ -8,7 +8,7 @@ license = "Apache-2.0" [dependencies] chrono = "0.4.19" thiserror = "1.0.30" -serde = "1.0.131" +serde = "1.0.133" url = { version = "2.2.2", features = ["serde"] } crc = "2.1.0" rand = "0.8.4" diff --git a/crates/handlers/Cargo.toml b/crates/handlers/Cargo.toml index d25fc25d..3b9d5c49 100644 --- a/crates/handlers/Cargo.toml +++ b/crates/handlers/Cargo.toml @@ -10,26 +10,26 @@ dev = ["mas-static-files/dev", "mas-templates/dev"] [dependencies] # Async runtime -tokio = { version = "1.14.0", features = ["macros"] } +tokio = { version = "1.15.0", features = ["macros"] } # Logging and tracing tracing = "0.1.29" # Error management thiserror = "1.0.30" -anyhow = "1.0.51" +anyhow = "1.0.52" # Web server warp = "0.3.2" hyper = { version = "0.14.16", features = ["full"] } # Database access -sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres"] } +sqlx = { version = "0.5.10", features = ["runtime-tokio-rustls", "postgres"] } # Various structure (de)serialization -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.133", features = ["derive"] } serde_with = { version = "1.11.0", features = ["hex", "chrono"] } -serde_json = "1.0.72" +serde_json = "1.0.74" serde_urlencoded = "0.7.0" # Password hashing @@ -40,7 +40,7 @@ rsa = { git = "https://github.com/sandhose/rsa.git", branch = "bump-pkcs" } pkcs8 = { version = "0.8.0", features = ["pem"] } elliptic-curve = { version = "0.11.6", features = ["pem"] } chacha20poly1305 = { version = "0.9.0", features = ["std"] } -sha2 = "0.9.8" +sha2 = "0.10.0" crc = "2.1.0" # Various data types and utilities diff --git a/crates/jose/Cargo.toml b/crates/jose/Cargo.toml index 4be4d999..738b59e6 100644 --- a/crates/jose/Cargo.toml +++ b/crates/jose/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" license = "Apache-2.0" [dependencies] -anyhow = "1.0.51" +anyhow = "1.0.52" async-trait = "0.1.52" base64ct = { version = "1.0.1", features = ["std"] } crypto-mac = { version = "0.11.1", features = ["std"] } @@ -20,11 +20,11 @@ pkcs8 = { version = "0.8.0", features = ["pem"] } rand = "0.8.4" rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } sec1 = "0.2.1" -serde = { version = "1.0.132", features = ["derive"] } -serde_json = "1.0.73" +serde = { version = "1.0.133", features = ["derive"] } +serde_json = "1.0.74" serde_with = { version = "1.11.0", features = ["base64"] } sha2 = "0.9.8" -signature = { version = "1.4.0" } +signature = "1.4.0" thiserror = "1.0.30" tokio = { version = "1.15.0", features = ["macros", "rt"] } url = { version = "2.2.2", features = ["serde"] } diff --git a/crates/oauth2-types/Cargo.toml b/crates/oauth2-types/Cargo.toml index 7ff21488..3ef2c8e9 100644 --- a/crates/oauth2-types/Cargo.toml +++ b/crates/oauth2-types/Cargo.toml @@ -6,9 +6,9 @@ edition = "2021" license = "Apache-2.0" [dependencies] -http = "0.2.5" -serde = "1.0.131" -serde_json = "1.0.72" +http = "0.2.6" +serde = "1.0.133" +serde_json = "1.0.74" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } parse-display = "0.5.3" diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml index 110bf10e..2840438c 100644 --- a/crates/storage/Cargo.toml +++ b/crates/storage/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = "1.14.0" -sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline"] } +tokio = "1.15.0" +sqlx = { version = "0.5.10", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline"] } chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.133", features = ["derive"] } thiserror = "1.0.30" -anyhow = "1.0.51" +anyhow = "1.0.52" tracing = "0.1.29" warp = "0.3.2" diff --git a/crates/tasks/Cargo.toml b/crates/tasks/Cargo.toml index 081d955a..d95b13bc 100644 --- a/crates/tasks/Cargo.toml +++ b/crates/tasks/Cargo.toml @@ -6,11 +6,11 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = { version = "1.14.0" } +tokio = "1.15.0" async-trait = "0.1.52" tokio-stream = "0.1.8" -futures-util = "0.3.18" +futures-util = "0.3.19" tracing = "0.1.29" -sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres"] } +sqlx = { version = "0.5.10", features = ["runtime-tokio-rustls", "postgres"] } mas-storage = { path = "../storage" } diff --git a/crates/templates/Cargo.toml b/crates/templates/Cargo.toml index 039e04c9..cac3fb87 100644 --- a/crates/templates/Cargo.toml +++ b/crates/templates/Cargo.toml @@ -10,14 +10,14 @@ dev = [] [dependencies] tracing = "0.1.29" -tokio = { version = "1.14.0", features = ["macros"] } +tokio = { version = "1.15.0", features = ["macros"] } -anyhow = "1.0.51" +anyhow = "1.0.52" thiserror = "1.0.30" tera = "1.15.0" -serde = { version = "1.0.131", features = ["derive"] } -serde_json = "1.0.72" +serde = { version = "1.0.133", features = ["derive"] } +serde_json = "1.0.74" serde_urlencoded = "0.7.0" url = "2.2.2" diff --git a/crates/warp-utils/Cargo.toml b/crates/warp-utils/Cargo.toml index 9741c281..d5ea353c 100644 --- a/crates/warp-utils/Cargo.toml +++ b/crates/warp-utils/Cargo.toml @@ -6,22 +6,22 @@ edition = "2021" license = "Apache-2.0" [dependencies] -tokio = { version = "1.14.0", features = ["macros"] } +tokio = { version = "1.15.0", features = ["macros"] } headers = "0.3.5" -cookie = "0.15.1" +cookie = "0.16.0" warp = "0.3.2" hyper = { version = "0.14.16", features = ["full"] } thiserror = "1.0.30" -anyhow = "1.0.51" -sqlx = { version = "0.5.9", features = ["runtime-tokio-rustls", "postgres"] } +anyhow = "1.0.52" +sqlx = { version = "0.5.10", features = ["runtime-tokio-rustls", "postgres"] } chrono = { version = "0.4.19", features = ["serde"] } -serde = { version = "1.0.131", features = ["derive"] } +serde = { version = "1.0.133", features = ["derive"] } serde_with = { version = "1.11.0", features = ["hex", "chrono"] } -serde_json = "1.0.72" +serde_json = "1.0.74" serde_urlencoded = "0.7.0" data-encoding = "2.3.2" chacha20poly1305 = { version = "0.9.0", features = ["std"] } -once_cell = "1.8.0" +once_cell = "1.9.0" tracing = "0.1.29" opentelemetry = "0.16.0" rand = "0.8.4"