From 08375f49cf9410f39fdbd3816c8bd1f9ff1286e2 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 16 Jul 2021 17:47:44 +0200 Subject: [PATCH] reorganize dependencies and upgrade them --- Cargo.lock | 41 +++++++++++----------- matrix-authentication-service/Cargo.toml | 44 ++++++++++++++++-------- oauth2-types/Cargo.toml | 2 +- 3 files changed, 52 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bc0d436b3..68fce4ccc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -132,9 +132,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.41" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" +checksum = "595d3cfa7a60d4555cb5067b99f07142a08ea778de5cf993f7b75c7d8fabc486" [[package]] name = "arrayref" @@ -584,9 +584,9 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" [[package]] name = "cc" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a72c244c1ff497a746a7e1fb3d14bd08420ecda70c8f25c7112f2781652d787" +checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" [[package]] name = "cfg-if" @@ -633,7 +633,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.43", + "time 0.1.44", "winapi", ] @@ -1185,7 +1185,7 @@ checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", ] [[package]] @@ -1433,9 +1433,9 @@ checksum = "3094308123a0e9fd59659ce45e22de9f53fc1d2ac6e1feb9fef988e4f76cad77" [[package]] name = "instant" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61124eeebbd69b8190558df225adf7e4caafce0d743919e5d6b19652314ec5ec" +checksum = "bee0328b1209d157ef001c94dd85b4f8f64139adb0eac2659f4b08382b2f474d" dependencies = [ "cfg-if 1.0.0", ] @@ -1707,9 +1707,9 @@ dependencies = [ [[package]] name = "parse-display" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7e98ea043e0880940ef455c6c6e5710b4f670b4f0aeff6edf320bb01143fe9" +checksum = "8f17011e14e6b831ed3aeab847a62fd338aee88539fcc99f23ce5ba98feba328" dependencies = [ "once_cell", "parse-display-derive", @@ -1718,9 +1718,9 @@ dependencies = [ [[package]] name = "parse-display-derive" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "962e8dc54ebea1392eb2f36a205f2efa9437bfe8e95d7a91f070044c363c9684" +checksum = "ad30302271e65d661910580baf25e874cd92c4595ddbed74d1ec9b2fdfaae64b" dependencies = [ "once_cell", "proc-macro2", @@ -2663,9 +2663,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" +checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "sval" @@ -2706,9 +2706,9 @@ dependencies = [ [[package]] name = "tera" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7571541dff0e57eaa2e931249f0d7489eb2b24b6b105546f8c2f1a47f15aaa3a" +checksum = "bf95b0d8a46da5fe3ea119394a6c7f1e745f9de359081641c99946e2bf55d4f2" dependencies = [ "chrono", "chrono-tz", @@ -2810,11 +2810,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -3152,9 +3153,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasm-bindgen" diff --git a/matrix-authentication-service/Cargo.toml b/matrix-authentication-service/Cargo.toml index f2bdec7d5..a967fb283 100644 --- a/matrix-authentication-service/Cargo.toml +++ b/matrix-authentication-service/Cargo.toml @@ -6,25 +6,41 @@ edition = "2018" license = "Apache-2.0" [dependencies] -clap = "3.0.0-beta.2" -serde = { version = "1.0.126", features = ["derive"] } +# Async runtime async-std = { version = "1.9.0", features = ["attributes"] } -tide = "0.16.0" +async-trait = "0.1.50" + +# Logging and tracing tracing = "0.1.26" tracing-subscriber = "0.2.19" -figment = { version = "0.10.6", features = ["env", "yaml", "test"] } -url = "2.2.2" -oauth2-types = { path = "../oauth2-types" } + +# Error management thiserror = "1.0.26" -async-trait = "0.1.50" -tera = "1.12.0" -anyhow = "1.0.41" +anyhow = "1.0.42" + +# Web server +tide = "0.16.0" +tide-tracing = "0.0.11" +tera = "1.12.1" csrf = "0.4.0" + +# Database access +sqlx = { version = "0.5.5", features = ["runtime-async-std-rustls", "postgres", "migrate", "chrono"] } + +# Various structure (de)serialization +serde = { version = "1.0.126", features = ["derive"] } +serde_yaml = "0.8.17" +serde_with = { version = "1.9.4", features = ["hex", "chrono"] } + +# Argument & config parsing +clap = "3.0.0-beta.2" +figment = { version = "0.10.6", features = ["env", "yaml", "test"] } +schemars = { version = "0.8.3", features = ["url", "chrono"] } + +# Various data types data-encoding = "2.3.2" chrono = { version = "0.4.19", features = ["serde"] } -tide-tracing = "0.0.11" +url = "2.2.2" mime = "0.3.16" -sqlx = { version = "0.5.5", features = ["runtime-async-std-rustls", "postgres", "migrate", "chrono"] } -serde_with = { version = "1.9.4", features = ["hex", "chrono"] } -schemars = { version = "0.8.3", features = ["url", "chrono"] } -serde_yaml = "0.8.17" + +oauth2-types = { path = "../oauth2-types" } diff --git a/oauth2-types/Cargo.toml b/oauth2-types/Cargo.toml index 7f0606958..fc076a33f 100644 --- a/oauth2-types/Cargo.toml +++ b/oauth2-types/Cargo.toml @@ -11,5 +11,5 @@ serde = "1.0.126" serde_json = "1.0.64" language-tags = { version = "0.3.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] } -parse-display = "0.5.0" +parse-display = "0.5.1" indoc = "1.0.3"