ensure we always print all --print options in help #137862
Conversation
|
r? @nnethercote rustbot has assigned @nnethercote. Use |
rustbot
added
A-run-make
|
This PR modifies cc @jieyouxu |
rustbot
added
the
T-compiler
| @@ -1508,6 +1534,13 @@ The default is {DEFAULT_EDITION} and the latest stable edition is {LATEST_STABLE | |||
| ) | |||
| }); | |||
|
|
|||
There was a problem hiding this comment.
can you make this a local variable instead?
There was a problem hiding this comment.
Sure, just remove pub or put it in some function?
There was a problem hiding this comment.
Yes, I meant making it a let variable in the function that uses it, then you don't need a lazylock
There was a problem hiding this comment.
Actually, when reading the code a bit, I see that this same thing is needed in the collect_print_requests function as well. In that case it makes sense to share it at the global scope, but I'd prefer a fn print_kinds_string() -> String function over a lazy lock.
There was a problem hiding this comment.
sounds good i'll make come up with a func somehwere.
There was a problem hiding this comment.
extracting to a function makes this all worse than a lazy lock imo. the reason theres a lazy lock is because make_opt expects your format string to be static lifetime. and its possible theres some way to craft a const fn print_kinds_str() that uses some const things and for loops to iterate over this list but it all seems overly complicated for this simple print code.
so can we stick with lazy lock? it follows the pattern of EDITION_STRING already there.
There was a problem hiding this comment.
ah, okay. it's fine then, I wasn't aware of the static lifetime requirement.
| ("target-libdir", PrintKind::TargetLibdir), | ||
| ("target-list", PrintKind::TargetList), | ||
| ("target-spec-json", PrintKind::TargetSpec), | ||
| ("tls-models", PrintKind::TlsModels), |
There was a problem hiding this comment.
If you want to make another PR improving --print, I'd suggest adding a third tuple field that indicates whether the print request is stable or not instead of the custom checks in collect_print_requests.
There was a problem hiding this comment.
good idea, I'll consider it. adding some more helper functions for the PrintKinds enum seem appropriate.
|
LGTM @bors r+ |
bors
added
S-waiting-on-bors
ensure we always print all --print options in help Closes rust-lang#137853 Refactors the PRINT_KINDS map into a public const so we always print every option for print. the list is quite long now, and idk if long term we want to keep printing all these options from --help.
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc`) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137685 (self-contained linker: conservatively default to `-znostart-stop-gc`) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#132388 (Implement `#[cfg]` in `where` clauses) - rust-lang#134900 (Fix parsing of ranges after unary operators) - rust-lang#136938 (Remove `:` from `stack-protector-heuristics-effect.rs` Filecheck Pattern) - rust-lang#137054 (Make phantom variance markers transparent) - rust-lang#137525 (Simplify parallelization in test-float-parse) - rust-lang#137618 (Skip `tidy` in pre-push hook if the user is deleting a remote branch) - rust-lang#137741 (Stop using `hash_raw_entry` in `CodegenCx::const_str`) - rust-lang#137849 (Revert "Remove Win SDK 10.0.26100.0 from CI") - rust-lang#137862 (ensure we always print all --print options in help) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of rust-lang#137862 - mtoner23:print-help, r=nnethercote ensure we always print all --print options in help Closes rust-lang#137853 Refactors the PRINT_KINDS map into a public const so we always print every option for print. the list is quite long now, and idk if long term we want to keep printing all these options from --help.
Closes #137853
Refactors the PRINT_KINDS map into a public const so we always print every option for print. the list is quite long now, and idk if long term we want to keep printing all these options from --help.