Make command infra less stateful and more regular#7750
Make command infra less stateful and more regular#7750Ericson2314 merged 1 commit intoNixOS:masterfrom
Conversation
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
🎉 All dependencies have been resolved ! |
d034acd to
e75c279
Compare
e75c279 to
14d6851
Compare
tomberek
left a comment
There was a problem hiding this comment.
Makes the flow of command processing more clear. Less state and more explicit passing of values.
459b196 to
98235f9
Compare
|
The macOS output seems a bit out of order? at least I am trouble reading it. Regardless, I think this is ready for review. I don't anticipate needing to change it much to fix this error. |
98235f9 to
7c37886
Compare
|
(Ah good, it went away) |
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: |
|
Could we use |
7c37886 to
d88d449
Compare
I added a pramga for that. I can't do the push-pop thing very well because the warning would also apply in every single sub-command, as opposed to just the It says Thanks for the review! |
Already, we had classes like `BuiltPathsCommand` and `StorePathsCommand`
which provided alternative `run` virtual functions providing the
implementation with more arguments. This was a very nice and easy way to
make writing command; just fill in the virtual functions and it is
fairly clear what to do.
However, exception to this pattern were `Installable{,s}Command`. These
two classes instead just had a field where the installables would be
stored, and various side-effecting `prepare` and `load` machinery too
fill them in. Command would wish out those fields.
This isn't so clear to use.
What this commit does is make those command classes like the others,
with richer `run` functions.
Not only does this restore the pattern making commands easier to write,
it has a number of other benefits:
- `prepare` and `load` are gone entirely! One command just hands just
hands off to the next.
- `useDefaultInstallables` because `defaultInstallables`. This takes
over `prepare` for the one case that needs it, and provides enough
flexiblity to handle `nix repl`'s idiosyncratic migration.
- We can use `ref` instead of `std::shared_ptr`. The former must be
initialized (so it is like Rust's `Box` rather than `Option<Box>`,
This expresses the invariant that the installable are in fact
initialized much better.
This is possible because since we just have local variables not
fields, we can stop worrying about the not-yet-initialized case.
- Fewer lines of code! (Finally I have a large refactor that makes the
number go down not up...)
- `nix repl` is now implemented in a clearer way.
The last item deserves further mention. `nix repl` is not like the other
installable commands because instead working from once-loaded
installables, it needs to be able to load them again and again.
To properly support this, we make a new superclass
`RawInstallablesCommand`. This class has the argument parsing and
completion logic, but does *not* hand off parsed installables but
instead just the raw string arguments.
This is exactly what `nix repl` needs, and allows us to instead of
having the logic awkwardly split between `prepare`,
`useDefaultInstallables,` and `load`, have everything right next to each
other. I think this will enable future simplifications of that argument
defaulting logic, but I am saving those for a future PR --- best to keep
code motion and more complicated boolean expression rewriting separate
steps.
The "diagnostic ignored `-Woverloaded-virtual`" pragma helps because C++
doesn't like our many `run` methods. In our case, we don't mind the
shadowing it all --- it is *intentional* that the derived class only
provides a `run` method, and doesn't call any of the overridden `run`
methods.
Helps with NixOS/rfcs#134
d88d449 to
bc23a44
Compare
Motivation
Already, we had classes like
BuiltPathsCommandandStorePathsCommandwhich provided alternativerunvirtual functions providing the implementation with more arguments. This was a very nice and easy way to make writing command; just fill in the virtual functions and it is fairly clear what to do.However, exception to this pattern were
Installable{,s}Command. These two classes instead just had a field where the installables would be stored, and various side-effectingprepareandloadmachinery too fill them in. Command would wish out those fields.This isn't so clear to use.
What this commit does is make those command classes like the others, with richer
runfunctions.Not only does this restore the pattern making commands easier to write, it has a number of other benefits:
prepareandloadare gone entirely! One command just hands just hands off to the next.useDefaultInstallablesbecausedefaultInstallables. This takes overpreparefor the one case that needs it, and provides enough flexiblity to handlenix repl's idiosyncratic migration.We can use
refinstead ofstd::shared_ptr. The former must be initialized (so it is like Rust'sBoxrather thanOption<Box>, This expresses the invariant that the installable are in fact initialized much better.This is possible because since we just have local variables not fields, we can stop worrying about the not-yet-initialized case.
Fewer lines of code! (Finally I have a large refactor that makes the number go down not up...)
nix replis now implemented in a clearer way.The last item deserves further mention.
nix replis not like the other installable commands because instead working from once-loaded installables, it needs to be able to load them again and again.To properly support this, we make a new superclass
RawInstallablesCommand. This class has the argument parsing and completion logic, but does not hand off parsed installables but instead just the raw string arguments.This is exactly what
nix replneeds, and allows us to instead of having the logic awkwardly split betweenprepare,useDefaultInstallables,andload, have everything right next to each other. I think this will enable future simplifications of that argument defaulting logic, but I am saving those for a future PR --- best to keep code motion and more complicated boolean expression rewriting separate steps.The "diagnostic ignored
-Woverloaded-virtual" pragma helps because C++ doesn't like our manyrunmethods. In our case, we don't mind the shadowing it all --- it is intentional that the derived class only provides arunmethod, and doesn't call any of the overriddenrunmethods.Context
Helps with NixOS/rfcs#134
Depends on #7748
Checklist for maintainers
Maintainers: tick if completed or explain if not relevant
tests/**.shsrc/*/teststests/nixos/*