Merge pull request #2851 from jpculp/more-rust-updates

More Rust dependency updates for upcoming v1.13 release
bottlerocket-os · Mar 6, 2023 · 2876d5c · 2876d5c
2 parents 9579659 + cc9b16f
commit 2876d5c
Show file tree

Hide file tree

Showing 14 changed files with 447 additions and 223 deletions.
diff --git a/sources/Cargo.lock b/sources/Cargo.lock
diff --git a/sources/api/migration/migrator/Cargo.toml b/sources/api/migration/migrator/Cargo.toml
@@ -20,7 +20,7 @@ regex = "1"
 semver = "1"
 simplelog = "0.12"
 snafu = "0.7"
-tough = "0.12"
+tough = "0.13"
 update_metadata = { path = "../../../updater/update_metadata", version = "0.1" }
 url = "2"
 

diff --git a/sources/deny.toml b/sources/deny.toml
@@ -62,10 +62,15 @@ skip = [
 skip-tree = [
     # aws-sdk-rust is using an older hyper-rustls
     { name = "hyper-rustls", version = "=0.22.1" },
-    # tungstenite is using an older sha-1
-    { name = "sha-1", version = "=0.9.8" },
-    # structopt is using an older clap and heck
+    # structopt pulls in an older version of clap
     { name = "structopt", version = "=0.3.26" },
+    # tungstenite is using an older sha-1
+    { name = "tungstenite", version = "=0.16" },
+    # windows-sys is not a direct dependency. mio and schannel
+    # are using different versions of windows-sys. we skip the
+    # dependency tree because windows-sys has many sub-crates
+    # that differ in major version.
+    { name = "windows-sys", version = "=0.42.0" },
 ]
 
 [sources]

diff --git a/sources/updater/updog/Cargo.toml b/sources/updater/updog/Cargo.toml
@@ -23,7 +23,7 @@ signpost = { path = "../signpost", version = "0.1" }
 simplelog = "0.12"
 snafu = "0.7"
 toml = "0.5"
-tough = { version = "0.12", features = ["http"] }
+tough = { version = "0.13", features = ["http"] }
 update_metadata = { path = "../update_metadata", version = "0.1" }
 structopt = "0.3"
 url = "2"

diff --git a/sources/updater/updog/src/transport.rs b/sources/updater/updog/src/transport.rs
@@ -71,7 +71,7 @@ impl Transport for HttpQueryTransport {
     fn fetch(
         &self,
         url: Url,
-    ) -> std::result::Result<Box<dyn std::io::Read + Send>, TransportError> {
+    ) -> std::result::Result<Box<dyn std::io::Read + Send + '_>, TransportError> {
         self.inner.fetch(self.parameters.add_params_to_url(url))
     }
 }