matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-29 22:01:14 +03:00
Code Activity

Bump serde_with

Browse Source
This commit is contained in:
Quentin Gliech
2022-08-01 19:38:22 +02:00
parent 83688c1a25
commit 44b2708f7a
16 changed files with 43 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Cargo.lock generated
View File

@ -1160,9 +1160,9 @@ dependencies = [
[[package]] [[package]]
name = "darling" name = "darling"
version = "0.13.4" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c" checksum = "4529658bdda7fd6769b8614be250cdcfc3aeb0ee72fe66f9e41e5e5eb73eac02"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"darling_macro", "darling_macro",
@ -1170,9 +1170,9 @@ dependencies = [
[[package]] [[package]]
name = "darling_core" name = "darling_core"
version = "0.13.4" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610" checksum = "649c91bc01e8b1eac09fb91e8dbc7d517684ca6be8ebc75bb9cafc894f9fdb6f"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
@ -1184,9 +1184,9 @@ dependencies = [
[[package]] [[package]]
name = "darling_macro" name = "darling_macro"
version = "0.13.4" version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835" checksum = "ddfc69c5bfcbd2fc09a0f38451d2daf0e372e367986a83906d1b0dbc88134fb5"
dependencies = [ dependencies = [
"darling_core", "darling_core",
"quote", "quote",
@ -3897,9 +3897,9 @@ checksum = "a2333e6df6d6598f2b1974829f853c2b4c5f4a6e503c10af918081aa6f8564e1"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.140" version = "1.0.141"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc855a42c7967b7c369eb5860f7164ef1f6f81c20c7cc1141f2a604e18723b03" checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500"
dependencies = [ dependencies = [
"serde_derive", "serde_derive",
] ]
@ -3919,9 +3919,9 @@ dependencies = [
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.140" version = "1.0.141"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6f2122636b9fe3b81f1cb25099fcf2d3f542cdb1d45940d56c713158884a05da" checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -3964,22 +3964,25 @@ dependencies = [
[[package]] [[package]]
name = "serde_with" name = "serde_with"
version = "1.14.0" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff" checksum = "89df7a26519371a3cce44fbb914c2819c84d9b897890987fa3ab096491cc0ea8"
dependencies = [ dependencies = [
"base64", "base64",
"chrono", "chrono",
"hex", "hex",
"indexmap",
"serde", "serde",
"serde_json",
"serde_with_macros", "serde_with_macros",
"time 0.3.12",
] ]
[[package]] [[package]]
name = "serde_with_macros" name = "serde_with_macros"
version = "1.5.2" version = "2.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082" checksum = "de337f322382fcdfbb21a014f7c224ee041a23785651db67b9827403178f698f"
dependencies = [ dependencies = [
"darling", "darling",
"proc-macro2", "proc-macro2",
@ -4458,6 +4461,7 @@ dependencies = [
"js-sys", "js-sys",
"libc", "libc",
"num_threads", "num_threads",
"serde",
"time-macros", "time-macros",
] ]

4
crates/axum-utils/Cargo.toml
View File

@ -18,8 +18,8 @@ http = "0.2.8"
http-body = "0.4.5" http-body = "0.4.5"
mime = "0.3.16" mime = "0.3.16"
rand = "0.8.5" rand = "0.8.5"
serde = "1.0.140" serde = "1.0.141"
serde_with = "1.14.0" serde_with = "2.0.0"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
serde_json = "1.0.82" serde_json = "1.0.82"
sqlx = "0.6.0" sqlx = "0.6.0"

4
crates/config/Cargo.toml
View File

@ -18,8 +18,8 @@ figment = { version = "0.10.6", features = ["env", "yaml", "test"] }
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_with = { version = "1.14.0", features = ["hex", "chrono"] } serde_with = { version = "2.0.0", features = ["hex", "chrono"] }
serde_json = "1.0.82" serde_json = "1.0.82"
sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] } sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] }
lettre = { version = "0.10.1", default-features = false, features = ["serde", "builder"] } lettre = { version = "0.10.1", default-features = false, features = ["serde", "builder"] }

2
crates/data-model/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
chrono = "0.4.19" chrono = "0.4.19"
thiserror = "1.0.31" thiserror = "1.0.31"
serde = "1.0.140" serde = "1.0.141"
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
crc = "3.0.0" crc = "3.0.0"
rand = "0.8.5" rand = "0.8.5"

4
crates/handlers/Cargo.toml
View File

@ -31,8 +31,8 @@ lettre = { version = "0.10.1", default-features = false, features = ["builder"]
sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] } sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres"] }
# Various structure (de)serialization # Various structure (de)serialization
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_with = { version = "1.14.0", features = ["hex", "chrono"] } serde_with = { version = "2.0.0", features = ["hex", "chrono"] }
serde_json = "1.0.82" serde_json = "1.0.82"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"

2
crates/http/Cargo.toml
View File

@ -19,7 +19,7 @@ opentelemetry = "0.17.0"
opentelemetry-http = "0.6.0" opentelemetry-http = "0.6.0"
opentelemetry-semantic-conventions = "0.9.0" opentelemetry-semantic-conventions = "0.9.0"
rustls = "0.20.6" rustls = "0.20.6"
serde = "1.0.140" serde = "1.0.141"
serde_json = "1.0.82" serde_json = "1.0.82"
thiserror = "1.0.31" thiserror = "1.0.31"
tokio = { version = "1.20.1", features = ["sync", "parking_lot"] } tokio = { version = "1.20.1", features = ["sync", "parking_lot"] }

2
crates/iana-codegen/Cargo.toml
View File

@ -12,7 +12,7 @@ convert_case = "0.5.0"
csv = "1.1.6" csv = "1.1.6"
futures-util = "0.3.21" futures-util = "0.3.21"
reqwest = { version = "0.11.11", features = ["blocking", "rustls-tls"], default-features = false } reqwest = { version = "0.11.11", features = ["blocking", "rustls-tls"], default-features = false }
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
tokio = { version = "1.20.1", features = ["full"] } tokio = { version = "1.20.1", features = ["full"] }
tracing = "0.1.36" tracing = "0.1.36"
tracing-subscriber = "0.3.15" tracing-subscriber = "0.3.15"

2
crates/iana/Cargo.toml
View File

@ -6,6 +6,6 @@ edition = "2021"
license = "Apache-2.0" license = "Apache-2.0"
[dependencies] [dependencies]
serde = "1.0.140" serde = "1.0.141"
schemars = "0.8.10" schemars = "0.8.10"
parse-display = "0.5.5" parse-display = "0.5.5"

4
crates/jose/Cargo.toml
View File

@ -24,9 +24,9 @@ rand = "0.8.5"
rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" } rsa = { git = "https://github.com/sandhose/RSA.git", branch = "bump-pkcs" }
schemars = "0.8.10" schemars = "0.8.10"
sec1 = "0.3.0" sec1 = "0.3.0"
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_json = "1.0.82" serde_json = "1.0.82"
serde_with = { version = "1.14.0", features = ["base64"] } serde_with = { version = "2.0.0", features = ["base64"] }
sha2 = "0.10.2" sha2 = "0.10.2"
signature = "1.5.0" signature = "1.5.0"
thiserror = "1.0.31" thiserror = "1.0.31"

4
crates/oauth2-types/Cargo.toml
View File

@ -7,13 +7,13 @@ license = "Apache-2.0"
[dependencies] [dependencies]
http = "0.2.8" http = "0.2.8"
serde = "1.0.140" serde = "1.0.141"
serde_json = "1.0.82" serde_json = "1.0.82"
language-tags = { version = "0.3.2", features = ["serde"] } language-tags = { version = "0.3.2", features = ["serde"] }
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", features = ["serde"] }
parse-display = "0.5.5" parse-display = "0.5.5"
indoc = "1.0.6" indoc = "1.0.6"
serde_with = { version = "1.14.0", features = ["chrono"] } serde_with = { version = "2.0.0", features = ["chrono"] }
chrono = "0.4.19" chrono = "0.4.19"
sha2 = "0.10.2" sha2 = "0.10.2"
data-encoding = "2.3.2" data-encoding = "2.3.2"

4
crates/oauth2-types/src/requests.rs
View File

@ -22,8 +22,8 @@ use mas_iana::oauth::{
use parse_display::{Display, FromStr}; use parse_display::{Display, FromStr};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::{ use serde_with::{
rust::StringWithSeparator, serde_as, skip_serializing_none, DisplayFromStr, DurationSeconds, formats::SpaceSeparator, serde_as, skip_serializing_none, DisplayFromStr, DurationSeconds,
SpaceSeparator, TimestampSeconds, StringWithSeparator, TimestampSeconds,
}; };
use url::Url; use url::Url;

2
crates/policy/Cargo.toml
View File

@ -8,7 +8,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
anyhow = "1.0.59" anyhow = "1.0.59"
opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" } opa-wasm = { git = "https://github.com/matrix-org/rust-opa-wasm.git" }
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_json = "1.0.82" serde_json = "1.0.82"
thiserror = "1.0.31" thiserror = "1.0.31"
tokio = { version = "1.20.1", features = ["io-util", "rt"] } tokio = { version = "1.20.1", features = ["io-util", "rt"] }

4
crates/router/Cargo.toml
View File

@ -7,7 +7,7 @@ license = "Apache-2.0"
[dependencies] [dependencies]
axum = { version = "0.5.13", default-features = false } axum = { version = "0.5.13", default-features = false }
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"
serde_with = "1.14.0" serde_with = "2.0.0"
url = "2.2.2" url = "2.2.2"

6
crates/router/src/endpoints.rs
View File

@ -13,18 +13,20 @@
// limitations under the License. // limitations under the License.
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use serde_with::{serde_as, DisplayFromStr};
pub use crate::traits::*; pub use crate::traits::*;
#[serde_as]
#[derive(Deserialize, Serialize, Clone, Debug)] #[derive(Deserialize, Serialize, Clone, Debug)]
#[serde(rename_all = "snake_case", tag = "next")] #[serde(rename_all = "snake_case", tag = "next")]
pub enum PostAuthAction { pub enum PostAuthAction {
ContinueAuthorizationGrant { ContinueAuthorizationGrant {
#[serde(deserialize_with = "serde_with::rust::display_fromstr::deserialize")] #[serde_as(as = "DisplayFromStr")]
data: i64, data: i64,
}, },
ContinueCompatSsoLogin { ContinueCompatSsoLogin {
#[serde(deserialize_with = "serde_with::rust::display_fromstr::deserialize")] #[serde_as(as = "DisplayFromStr")]
data: i64, data: i64,
}, },
ChangePassword, ChangePassword,

2
crates/storage/Cargo.toml
View File

@ -9,7 +9,7 @@ license = "Apache-2.0"
tokio = "1.20.1" tokio = "1.20.1"
sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json"] } sqlx = { version = "0.6.0", features = ["runtime-tokio-rustls", "postgres", "migrate", "chrono", "offline", "json"] }
chrono = { version = "0.4.19", features = ["serde"] } chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_json = "1.0.82" serde_json = "1.0.82"
thiserror = "1.0.31" thiserror = "1.0.31"
anyhow = "1.0.59" anyhow = "1.0.59"

2
crates/templates/Cargo.toml
View File

@ -16,7 +16,7 @@ anyhow = "1.0.59"
thiserror = "1.0.31" thiserror = "1.0.31"
tera = "1.16.0" tera = "1.16.0"
serde = { version = "1.0.140", features = ["derive"] } serde = { version = "1.0.141", features = ["derive"] }
serde_json = "1.0.82" serde_json = "1.0.82"
serde_urlencoded = "0.7.1" serde_urlencoded = "0.7.1"