-
Notifications
You must be signed in to change notification settings - Fork 13.8k
bootstrap: lower verbosity of cargo to one less than bootstrap's #146609
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
bootstrap: lower verbosity of cargo to one less than bootstrap's #146609
Conversation
the main thing this does is eliminate the "Fresh ..." output when `--verbose` is only passed once.
if builder.is_verbose() { | ||
cargo.arg("--verbose"); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're already setting verbosity in Builder::cargo
, which is indirectly called by prepare_tool_cargo
, so this is not needed.
cargo.arg("-v"); | ||
// verbose cargo output is very noisy, so only enable it with -vv | ||
for _ in 0..self.verbosity.saturating_sub(1) { | ||
cargo.arg("--verbose"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
changed from -v
to --verbose
for consistency and grepability.
Thanks! @bors r+ rollup |
Rollup of 9 pull requests Successful merges: - #145095 (Migrate `UnsizedConstParamTy` to unstable impl of `ConstParamTy_`) - #145960 (Split `FnCtxt::report_args_error` into subfunctions) - #146402 (interpret: fix overlapping aggregate initialization) - #146466 (llvm-wrapper: other cleanup) - #146574 (compiletest: Enable new-output-capture by default) - #146599 (replace some `#[const_trait]` with `const trait`) - #146601 (compiletest: Make `./x test --test-args ...` work again) - #146608 (improve internal bootstrap docs) - #146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 9 pull requests Successful merges: - #145095 (Migrate `UnsizedConstParamTy` to unstable impl of `ConstParamTy_`) - #145960 (Split `FnCtxt::report_args_error` into subfunctions) - #146402 (interpret: fix overlapping aggregate initialization) - #146466 (llvm-wrapper: other cleanup) - #146574 (compiletest: Enable new-output-capture by default) - #146599 (replace some `#[const_trait]` with `const trait`) - #146601 (compiletest: Make `./x test --test-args ...` work again) - #146608 (improve internal bootstrap docs) - #146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of #146609 - lolbinarycat:bootstrap-less-verbose-cargo, r=Kobzol bootstrap: lower verbosity of cargo to one less than bootstrap's the main thing this does is eliminate the "Fresh ..." output when `--verbose` is only passed once. r? `@Kobzol`
} | ||
|
||
if self.is_verbose() { | ||
if self.is_verbose_than(1) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Huh, that's a weird (pre-existing) function name. I had to look at the code to understand what it meant. is_more_verbose_than
would be clearer. Even clearer would be just removing it and using if self.verbosity > 1
directly. The related verbose_than
function could also be removed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, the names are pretty terrible here, I plan to rename them, once I get to it.
Rollup of 9 pull requests Successful merges: - rust-lang/rust#145095 (Migrate `UnsizedConstParamTy` to unstable impl of `ConstParamTy_`) - rust-lang/rust#145960 (Split `FnCtxt::report_args_error` into subfunctions) - rust-lang/rust#146402 (interpret: fix overlapping aggregate initialization) - rust-lang/rust#146466 (llvm-wrapper: other cleanup) - rust-lang/rust#146574 (compiletest: Enable new-output-capture by default) - rust-lang/rust#146599 (replace some `#[const_trait]` with `const trait`) - rust-lang/rust#146601 (compiletest: Make `./x test --test-args ...` work again) - rust-lang/rust#146608 (improve internal bootstrap docs) - rust-lang/rust#146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's) r? `@ghost` `@rustbot` modify labels: rollup
Hm, this is exact opposite of what I wanted last time I used |
Or maybe it wasn't bootstrap output? I am talking about this:
That looks like cargo debug output? Normal |
That's manually configured by bootstrap: rust/src/bootstrap/src/core/builder/cargo.rs Line 1136 in 14415c7
I haven't ever used this output, while on the other hand I do often want to see with which cmdline arguments Cargo invokes We could instead decide what is outputted on a more fine-grained level. For example, we could include the Cargo fingerprint output in our tracing system, so it would be That being said, if we do order just on the literal verbosity of the output, the fingerprints are much more spammy than the rustc execution log, so from that point of view its current verbosity level makes sense. |
Seeing the command sis also definitely good, also something I ran into every now and then. So I agree with this PR, if you just want to see that then also seeing the huge rustc invocations cargo produces is often just a distraction (in particular since it's not actually the final rustc invocation as there's the bootstrap wrapper adjusting the arguments further). |
Rollup of 9 pull requests Successful merges: - rust-lang#145095 (Migrate `UnsizedConstParamTy` to unstable impl of `ConstParamTy_`) - rust-lang#145960 (Split `FnCtxt::report_args_error` into subfunctions) - rust-lang#146402 (interpret: fix overlapping aggregate initialization) - rust-lang#146466 (llvm-wrapper: other cleanup) - rust-lang#146574 (compiletest: Enable new-output-capture by default) - rust-lang#146599 (replace some `#[const_trait]` with `const trait`) - rust-lang#146601 (compiletest: Make `./x test --test-args ...` work again) - rust-lang#146608 (improve internal bootstrap docs) - rust-lang#146609 (bootstrap: lower verbosity of cargo to one less than bootstrap's) r? `@ghost` `@rustbot` modify labels: rollup
the main thing this does is eliminate the "Fresh ..." output when
--verbose
is only passed once.r? @Kobzol