kargs: Various cleanups #645
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
- Accept &str vs owned String, allowing dropping unnecessary `clone` - It isn't parsing a file necessarily, just a string buffer, so rename it - Drop unnecessary `pub` - Add doc comment - Add error context to callers to be clear *which* file we failed to parse Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Colin Walters <walters@verbum.org>
liboverdrop isn't helpful here because I don't think we want or need right now to actually support things like having a file in `/etc` or `/run` override the kargs. Especially for `/run` there's no dynamic runtime state. It *might* in theory be useful for someone to have `/etc` overrides, but since we weren't actually doing that today, don't pretend we might by using liboverdrop but not passing `/etc` to it. Using cap-std here makes it easier to unit test safely. (Although, liboverdrop really should grow an optional feature to use cap-std) Signed-off-by: Colin Walters <walters@verbum.org>
Since the function accepts a `&str`, drop the unnecessary cloning. Signed-off-by: Colin Walters <walters@verbum.org>
By passing ownership of the vector here we don't need to make it `mut`able. Signed-off-by: Colin Walters <walters@verbum.org>
We can just pass the iterator directly to `extend`. Signed-off-by: Colin Walters <walters@verbum.org>
No functional changes, but it's clearer to have the `remote_kargs` definition below where we do the short-circuit. Signed-off-by: Colin Walters <walters@verbum.org>
- Change filtering to use combinators which is a bit clearer I think - Rework to directly return the deserialized args from the toml file and avoid moving them into a new vector - Drop the now unnecessary `mut` Signed-off-by: Colin Walters <walters@verbum.org>
Prep for more tests. Signed-off-by: Colin Walters <walters@verbum.org>
Somehow, something else is leaking into `/tmp` at least in the GHA runs...remove it all. Signed-off-by: Colin Walters <walters@verbum.org>
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.
No functional changes intended; just prep for further work.
kargs: parser cleanups
cloneit
pubto parse
Signed-off-by: Colin Walters walters@verbum.org
kargs: Add a few more unit tests
Signed-off-by: Colin Walters walters@verbum.org
kargs: Parse booted kargs via cap-std, not liboverdrop
liboverdrop isn't helpful here because I don't think we want
or need right now to actually support things like having a file
in
/etcor/runoverride the kargs. Especially for/runthere's no dynamic runtime state.
No functional changes intended, just prep for more work.
It might in theory be useful for someone to have
/etcoverrides, but since we weren't actually doing that today, don't
pretend we might by using liboverdrop but not passing
/etctoit.
Using cap-std here makes it easier to unit test safely.
(Although, liboverdrop really should grow an optional feature
to use cap-std)
Signed-off-by: Colin Walters walters@verbum.org
kargs: Drop unnecessary cloning for sys_arch
Since the function accepts a
&str, drop the unnecessary cloning.Signed-off-by: Colin Walters walters@verbum.org
kargs: Drop unnecessary
mutBy passing ownership of the vector here we don't need to make
it
mutable.Signed-off-by: Colin Walters walters@verbum.org
kargs: Drop unnecessary allocation and
mutWe can just pass the iterator directly to
extend.Signed-off-by: Colin Walters walters@verbum.org
kargs: Minor code reordering
No functional changes, but it's clearer to have the
remote_kargsdefinition below where we do the short-circuit.
Signed-off-by: Colin Walters walters@verbum.org