Merge pull request #1750 from tjkirch/rust-deps

Update Rust dependencies
bottlerocket-os · Sep 17, 2021 · df7c522 · df7c522
2 parents 0a82cf1 + fe98ffa
commit df7c522
Show file tree

Hide file tree

Showing 11 changed files with 337 additions and 314 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/api/early-boot-config/Cargo.toml b/sources/api/early-boot-config/Cargo.toml
@@ -20,8 +20,8 @@ imdsclient = { path = "../../imdsclient" }
 log = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-serde_plain = "0.3"
-serde-xml-rs = "0.4.1"
+serde_plain = "1.0"
+serde-xml-rs = "0.5"
 simplelog = "0.10"
 snafu = "0.6"
 tokio = { version = "~1.8", default-features = false, features = ["macros", "rt-multi-thread"] }  # LTS

diff --git a/sources/api/netdog/Cargo.toml b/sources/api/netdog/Cargo.toml
@@ -18,7 +18,7 @@ rand = { version = "0.8", default-features = false, features = ["std", "std_rng"
 regex = "1.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1"
-serde_plain = "0.3.0"
+serde_plain = "1.0"
 snafu = "0.6"
 
 [build-dependencies]

diff --git a/sources/api/netdog/src/main.rs b/sources/api/netdog/src/main.rs
@@ -86,9 +86,9 @@ enum InterfaceFamily {
 }
 
 // Implement `from_str()` so argh can attempt to deserialize args into their proper types
-forward_from_str_to_serde!(InterfaceName);
-forward_from_str_to_serde!(InterfaceType);
-forward_from_str_to_serde!(InterfaceFamily);
+derive_fromstr_from_deserialize!(InterfaceName);
+derive_fromstr_from_deserialize!(InterfaceType);
+derive_fromstr_from_deserialize!(InterfaceFamily);
 
 /// Stores user-supplied arguments.
 #[derive(FromArgs, PartialEq, Debug)]

diff --git a/sources/api/thar-be-updates/Cargo.toml b/sources/api/thar-be-updates/Cargo.toml
@@ -24,7 +24,7 @@ num-traits = "0.2.12"
 semver = { version = "1.0", features = [ "serde" ] }
 serde = { version = "1.0.111", features = [ "derive" ] }
 serde_json = "1.0.53"
-serde_plain = "0.3.0"
+serde_plain = "1.0"
 signpost = { path = "../../updater/signpost" }
 simplelog = "0.10"
 snafu = "0.6.8"

diff --git a/sources/models/Cargo.toml b/sources/models/Cargo.toml
@@ -17,7 +17,7 @@ model-derive = { path = "model-derive" }
 regex = "1.1"
 semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-serde_plain = "0.3.0"
+serde_plain = "1.0"
 snafu = "0.6"
 toml = "0.5"
 x509-parser = "0.9.2"

diff --git a/sources/updater/signpost/Cargo.toml b/sources/updater/signpost/Cargo.toml
@@ -14,5 +14,5 @@ block-party = { path = "../block-party" }
 gptman = { version = "0.6.1", default-features = false }
 hex-literal = "0.3.0"
 serde = { version = "1.0.91", features = ["derive"] }
-serde_plain = "0.3.0"
+serde_plain = "1.0"
 snafu = { version = "0.6.0", default-features = false, features = ["std"] }
diff --git a/sources/updater/update_metadata/Cargo.toml b/sources/updater/update_metadata/Cargo.toml
@@ -15,7 +15,7 @@ regex = "1.1"
 semver = { version = "1.0", features = ["serde"] }
 serde = { version = "1.0.100", features = ["derive"] }
 serde_json = "1.0.40"
-serde_plain = "0.3.0"
+serde_plain = "1.0"
 snafu = "0.6.0"
 toml = "0.5"
 

diff --git a/sources/updater/updog/Cargo.toml b/sources/updater/updog/Cargo.toml
@@ -18,7 +18,7 @@ reqwest = { version = "0.11.1", default-features = false, features = ["rustls-tl
 semver = "1.0"
 serde = { version = "1.0.100", features = ["derive"] }
 serde_json = "1.0.40"
-serde_plain = "0.3.0"
+serde_plain = "1.0"
 signpost = { path = "../signpost" }
 simplelog = "0.10"
 snafu = "0.6.0"