Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More Rust dependency updates for upcoming v1.13 release #2851

Merged
merged 3 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 38 additions & 18 deletions sources/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion sources/api/migration/migrator/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
11 changes: 8 additions & 3 deletions sources/deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion sources/updater/updog/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion sources/updater/updog/src/transport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
}
Loading