Upgrade nftnl to fix cargo deny error
#6748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarkusPettersson98
force-pushed
the
proc-macro-error-unmaintained
branch
from
a5b70cb
to
fc583f5
Compare
This was referenced Sep 6, 2024
MarkusPettersson98
force-pushed
the
proc-macro-error-unmaintained
branch
3 times, most recently
from
bd99c97
to
7a97d84
Compare
faern
reviewed
Sep 19, 2024
There was a problem hiding this comment.
Reviewed 4 of 6 files at r1, 1 of 2 files at r2.
Reviewable status: 5 of 6 files reviewed, all discussions resolved
MarkusPettersson98
force-pushed
the
proc-macro-error-unmaintained
branch
from
7a97d84
to
7a1c230
Compare
MarkusPettersson98
requested review from
raksooo,
pinkisemils and
albin-mullvad
as code owners
MarkusPettersson98
force-pushed
the
proc-macro-error-unmaintained
branch
from
7a1c230
to
4b2b460
Compare
pinkisemils
approved these changes
Sep 19, 2024
There was a problem hiding this comment.
Reviewed 2 of 2 files at r3, all commit messages.
Reviewable status:complete! all files reviewed, all discussions resolved
pinkisemils
approved these changes
Sep 19, 2024
There was a problem hiding this comment.
Reviewed 4 of 6 files at r1.
Reviewable status:
faern
approved these changes
Sep 19, 2024
There was a problem hiding this comment.
Reviewed 2 of 2 files at r3, all commit messages.
Reviewable status:
Fix `cargo deny` complaining about `proc-macro-error` being unmaintained by upgrading `nftnl` to a version which no longer depends on `err-derive`, which in turn depended on `proc-macro-error`. This commit also upgrades `bitflags` to `2.6.0` from `2.5.0` in `talpid-core`. Version `2.6.0` is pinned by `nftnl` for some reason, and `cargo` was unhappy with having both `2.5.0` and `2.6.0` in the same crate. Manually derive `Debug` where needed after upgrade to `bitflags 2.6.0`.
MarkusPettersson98
force-pushed
the
proc-macro-error-unmaintained
branch
from
4b2b460
to
dfaa2d8
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR resolves #6747.
Fix
cargo denycomplaining aboutproc-macro-errorbeing unmaintained by upgradingnftnlto a version which no longer depends onerr-derive, which in turn depended onproc-macro-error.This PR also upgrades
bitflagsto2.6.0from2.5.0intalpid-core. Version2.6.0is pinned bynftnlfor some reason, andcargowas unhappy with having both2.5.0and2.6.0in the same crate.With this change we also drop 5 direct dependencies, and even more indirect dependencies! 🎉
Fixes DES-1228
TODO
RUSTSEC-2024-0370incargo denyRUSTSEC-2024-0370inosv-scannerRUSTSEC-2024-0370incargo auditThis change is