Injector: allow directly specifying a binary#58
Merged
Conversation
This allows us to, in a workspace that has the osiris repo as member, to still run the injector
Contributor
There was a problem hiding this comment.
Pull request overview
Updates the xtasks injector CLI to support patching a specific ELF directly (useful when osiris is a workspace member and cargo-metadata discovery isn’t desirable).
Changes:
- Make
manifestoptional and add--elf <PATH>to bypass cargo metadata binary discovery. - Update
main()flow to select binaries from either--elformanifest-based discovery.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
+196
to
+204
| let binaries = if let Some(elf) = cli.elf { | ||
| vec![elf] | ||
| } else { | ||
| let manifest = cli.manifest.unwrap_or_else(|| { | ||
| log::error!("either <MANIFEST> or --elf must be provided"); | ||
| process::exit(1); | ||
| }); | ||
| match extract_binaries(&manifest, cli.target) { | ||
| Ok(bins) => bins, |
There was a problem hiding this comment.
This if let Some(elf) = cli.elf moves cli.elf, which partially moves cli and makes subsequent uses of cli.manifest / cli.target in the else branch fail to compile. Destructure cli first (e.g., let Cli { manifest, target, elf } = cli;) or borrow elf with as_ref() and clone as needed before accessing other fields.
LCOV of commit
|
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
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 allows us to, in a workspace that has the osiris repo as member, to still run the injector