structopt -> clap, Rust 1.90/2024, swadm link apply command #134
Conversation
This file contains hidden or 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
rcgoodfellow
changed the title
rcgoodfellow
changed the title
see OPTE #861
rcgoodfellow
force-pushed
the
ry/cli-updates
branch
from
5cf128e to
8db60d6
Compare
rcgoodfellow
changed the title
|
Able to move to 1.90 after |
Nieuwejaar
reviewed
Sep 26, 2025
|
|
||
| // Parse all of the arguments to an action | ||
| fn get_action_args(variant: &Variant) -> Result<Vec<ActionArg>> { | ||
| fn get_action_args(variant: &Variant) -> Result<Vec<ActionArg<'_>>> { |
There was a problem hiding this comment.
This is weird. I guess it's because ActionArg contains Ident<'a>? I wonder why Ident has a lifetime. Hmm. Not for today.
| // we wouldn't expect this state to change other than at our direction, this | ||
| // callback will generally be a no-op. The only exception would be if somebody | ||
| // were using the bf cli to manipulate ports, at which point all bets are off as | ||
| // to what's happening with the port. |
| // Sizes of the port and LAG bitmap arrays in a multicast group | ||
| pub const BF_MC_PORT_ARRAY_SIZE: usize = (BF_PORT_COUNT as usize + 7) / 8; | ||
| pub const BF_MC_LAG_ARRAY_SIZE: usize = (BF_LAG_COUNT as usize + 7) / 8; | ||
| pub const BF_MC_PORT_ARRAY_SIZE: usize = (BF_PORT_COUNT as usize).div_ceil(8); |
There was a problem hiding this comment.
Did clippy pick this up? I'm surprised.
There was a problem hiding this comment.
Clippy did indeed.
| } | ||
| } | ||
|
|
||
| /// A Vlan identifier, made up of a port, link, and vlan tag. |
There was a problem hiding this comment.
I thought I took all this out as part of the latest ECMP work. Hmm.
Nieuwejaar
approved these changes
Sep 26, 2025
rcgoodfellow
force-pushed
the
ry/cli-updates
branch
from
0a849b5 to
9c68ec2
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes
Which is closed as completed, but has not been done yet.
After removing structopt I bumped dependencies. This required going to rust 1.90 to pick up some features OPTE is now using that have only been stable since 1.90. Then clippy got angry with me and I needed let chains to solve some of the clippy rage cleanly. So I also moved to 2024.
The majority of the changes in this PR are dealing with clippy in going to Rust 1.90/2024.
The move from structopt to clap is in the first commit. Then there are a bunch of commits dealing with the rust version bump. Then c82dae4 adds the link apply command and the commits that follow fix up a few things with aliases I noticed when using the new
swadmto do some debugging on a racklette.