Skip to content

Conversation

alexcrichton
Copy link
Member

This PR is a series of commits to handle a number of updates to dependencies in Wasmtime. I've separated out each dependency by commit to see what's going on. The biggest upgrades were syn 2.x.x, clap 4.x.x, and bitflags 2.x.x. All the other updates were mostly minor.

In terms of vetting I've added a number of new trusted annotations crates that are authored by those we already trust (e.g. me, Dan, epage, etc). I've additionally performed a variety of audits for new versions that aren't covered by our preexisting policies.

At some point we need to revisit cargo deny's configuration because we have quite a few duplicated dependencies which aren't being caught by cargo deny and I'm not entirely sure why. I think that our ignore list is too aggressive and/or not interacting well with how cargo deny works. I'll try to poke at this in the future.

This isn't used any more so no need to continue to list this.
This removes a `deny.toml` exception for that crate, but `openvino-sys`
still depends on `pretty_env_logger 0.4.0` so a new exception is added
for that.
This commit started out by updating the `criterion` dependency to remove
an entry in `deny.toml`, but that ended up transitively requiring a
`clap` dependency upgrade from 3.x to 4.x because `criterion` uses
pieces of clap 4.x. Most of this commit is then dedicated to updating
clap 3.x to 4.x which was relatively simple, mostly renaming attributes
here and there.
I originally wanted to remove the `indexmap` clause in `deny.toml` but
enough dependencies haven't updated from 1.9 to 2.0 that it wasn't
possible. In the meantime though this updates some various dependencies
to bring them to the latest and a few of them now use `indexmap` 2.0.
This involved updating tokio/mio and then providing new audits for new
crates. The tokio exemption was updated from its old version to the new
version and tokio remains un-audited.
This required a bit of rewriting for the component-macro related bits
but otherwise was pretty straightforward. The `syn` 1.x.x track is still
present in the wasi-crypto tree at this time.

I've additionally added some trusted audits for my own publications of
`wasm-bindgen`
This updates Wasmtime's dependency on the `bitflags` crate to the 2.x.x
track to keep it up-to-date.
This bumps them all to the next major version to keep up with updates.
I've additionally added trusted entries for publishes of cap-std crates
from Dan.

There's still lingering references to rustix 0.37.x which will need to
get weeded out over time.
Avoids having two versions in our crate graph.
@alexcrichton alexcrichton requested review from a team as code owners July 14, 2023 21:34
@alexcrichton alexcrichton requested review from fitzgen and removed request for a team July 14, 2023 21:34
Copy link
Member

@sunfishcode sunfishcode left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, with one comment:

@@ -47,7 +48,7 @@ pub(super) fn define_flags(
if #repr::from(!#ident::all()) & value != 0 {
Err(wiggle::GuestError::InvalidFlagValue(stringify!(#ident)))
} else {
Ok(#ident { bits: value })
Ok(#ident::from_bits_truncate(value))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

from_bits_truncate silently drops unknown flags; should this use from_bits and return an InvalidFlagValue if it doesn't succeed?

@github-actions github-actions bot added cranelift Issues related to the Cranelift code generator wasi Issues pertaining to WASI labels Jul 14, 2023
@alexcrichton alexcrichton enabled auto-merge July 15, 2023 01:19
@alexcrichton alexcrichton added this pull request to the merge queue Jul 15, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 15, 2023
@alexcrichton alexcrichton enabled auto-merge July 15, 2023 01:55
@alexcrichton alexcrichton added this pull request to the merge queue Jul 15, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Jul 15, 2023
@alexcrichton alexcrichton enabled auto-merge July 15, 2023 02:34
@alexcrichton alexcrichton added this pull request to the merge queue Jul 15, 2023
Merged via the queue into bytecodealliance:main with commit 6d7bb36 Jul 15, 2023
@alexcrichton alexcrichton deleted the update-deps branch July 15, 2023 03:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cranelift Issues related to the Cranelift code generator wasi Issues pertaining to WASI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants