cargo: Bump serde_yaml to 0.9
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

As the bump of `serde_yaml` to `0.9` breaks all enums and especially
all optional enums use `#[serde(with =
"serde_yaml::with::singleton_map_recursive")]` at some places to fix
it.
This commit is contained in:
finga 2023-06-11 16:31:40 +02:00
parent 849c91c8ae
commit d25143c1fd
4 changed files with 14 additions and 19 deletions

28
Cargo.lock generated
View file

@ -757,12 +757,6 @@ version = "0.2.146"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
[[package]]
name = "linked-hash-map"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
[[package]]
name = "linux-raw-sys"
version = "0.3.8"
@ -1331,14 +1325,15 @@ dependencies = [
[[package]]
name = "serde_yaml"
version = "0.8.26"
version = "0.9.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b"
checksum = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c"
dependencies = [
"indexmap",
"itoa",
"ryu",
"serde",
"yaml-rust",
"unsafe-libyaml",
]
[[package]]
@ -1740,6 +1735,12 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unsafe-libyaml"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1865806a559042e51ab5414598446a5871b561d21b6764f2eabb0dd481d880a6"
[[package]]
name = "untrusted"
version = "0.7.1"
@ -1992,15 +1993,6 @@ dependencies = [
"memchr",
]
[[package]]
name = "yaml-rust"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
dependencies = [
"linked-hash-map",
]
[[package]]
name = "yansi"
version = "0.5.1"

View file

@ -25,7 +25,7 @@ run_script = "0.9"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
serde_regex = "1.1"
serde_yaml = "0.8"
serde_yaml = "0.9"
sha2 = "0.9"
thiserror = "1.0"

View file

@ -26,7 +26,9 @@ impl AddrType {
#[derive(Debug, Deserialize, Serialize)]
#[serde(deny_unknown_fields, rename_all = "lowercase")]
pub enum IpFilter {
#[serde(with = "serde_yaml::with::singleton_map_recursive")]
Allow(Vec<AddrType>),
#[serde(with = "serde_yaml::with::singleton_map_recursive")]
Deny(Vec<AddrType>),
}

View file

@ -55,6 +55,7 @@ pub struct Hook {
signature: String,
ip_filter: Option<IpFilter>,
secrets: Vec<String>,
#[serde(with = "serde_yaml::with::singleton_map_recursive")]
filter: FilterType,
}