chore: sync Cargo.lock

Rebased onto master to drop the merge commit, which left Cargo.lock with
uncommitted changes. The cleaner fix would be to squash these into the
commits that introduced the dependencies, but I went with the simpler
approach.

Author: va-an