Support extra-verbose builds #48943
Merged
Support extra-verbose builds #48943
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
pietroalbini
added
the
S-waiting-on-review
|
Highfive failed to assign a reviewer. |
|
r=me after fixing tidy: |
kennytm
added
S-waiting-on-author
kennytm
reviewed
Mar 13, 2018
src/bootstrap/bootstrap.py
Outdated
| @@ -597,10 +597,8 @@ def build_bootstrap(self): | |||
| self.cargo())) | |||
| args = [self.cargo(), "build", "--manifest-path", | |||
| os.path.join(self.rust_root, "src/bootstrap/Cargo.toml")] | |||
| if self.verbose: | |||
| for _ in range(0, max(0, self.verbose - 1)): | |||
There was a problem hiding this comment.
In both Python 2 and 3, range(0, self.verbose - 1) will be empty when self.verbose - 1 is zero or negative, so the max(0, _) is unnecessary.
src/bootstrap/flags.rs
Outdated
| @@ -29,7 +29,7 @@ use cache::{Interned, INTERNER}; | |||
|
|
|||
| /// Deserialized version of all flags for this compile. | |||
| pub struct Flags { | |||
| pub verbose: usize, // verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose | |||
| pub verbose: usize, // verbosity level: 0 == not verbose, 1 == verbose, 2 == very verbose, 3 == omg so verbose | |||
There was a problem hiding this comment.
🤣
(This line is >100 chars BTW)
src/bootstrap/lib.rs
Outdated
| pub fn is_very_verbose(&self) -> bool { | ||
| self.verbosity > 1 | ||
| pub fn cargo_verbosity_level(&self) -> usize { | ||
| if self.verbosity == 0 { 0 } else { self.verbosity - 1 } |
There was a problem hiding this comment.
This can be simply self.verbosity.saturating_sub(1)
Alternatively you could use this in src/bootstrap/builder.rs to entirely get rid of this function.
// if rustbuild is invoked with N `-v`s, we pass N-1 `-v`s to cargo.
for _ in 1..self.verbosity {
cargo.arg("-v");
}
- The bootstrap crate currently passes -v to Cargo if itself invoked
with -vv. But Cargo supports -vv (to show build script output), so make
bootstrap pass that if itself invoked with -vvv. (More specifically,
pass N '-v's to Cargo if invoked with N+1 of them.)
- bootstrap.py currently tries to pass on up to two '-v's to cargo when
building bootstrap, but incorrectly ('-v' is marked as 'store_true', so
argparse stores either False or True, ignoring multiple '-v's). Fix
this, allow passing any number of '-v's, and make it consistent with
bootstrap's invocation of Cargo (i.e. subtract one from the number of
'-v's).
- Also improve bootstrap.py's config.toml 'parsing' to support arbitrary
verbosity levels, + allow command line to override it.
|
Updated in light of review comments. |
|
r? @kennytm |
|
@bors r+ |
|
📌 Commit ec49234 has been approved by |
bors
added
S-waiting-on-bors
|
@bors: rollup |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Mar 17, 2018
Support extra-verbose builds
- The bootstrap crate currently passes -v to Cargo if itself invoked with -vv. But Cargo supports -vv (to show build script output), so make bootstrap pass that if itself invoked with -vvv. (More specifically, pass N '-v's to Cargo if invoked with N+1 of them.)
- bootstrap.py currently tries to pass on up to two '-v's to cargo when building bootstrap, but incorrectly ('-v' is marked as 'store_true', so argparse stores either False or True, ignoring multiple '-v's). Fix this, allow passing any number of '-v's, and make it consistent with bootstrap's invocation of Cargo (i.e. subtract one from the number of '-v's).
- Also improve bootstrap.py's config.toml 'parsing' to support arbitrary verbosity levels, + allow command line to override it.
bors
added a commit
that referenced
this pull request
Mar 17, 2018
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.
The bootstrap crate currently passes -v to Cargo if itself invoked with -vv. But Cargo supports -vv (to show build script output), so make bootstrap pass that if itself invoked with -vvv. (More specifically, pass N '-v's to Cargo if invoked with N+1 of them.)
bootstrap.py currently tries to pass on up to two '-v's to cargo when building bootstrap, but incorrectly ('-v' is marked as 'store_true', so argparse stores either False or True, ignoring multiple '-v's). Fix this, allow passing any number of '-v's, and make it consistent with bootstrap's invocation of Cargo (i.e. subtract one from the number of '-v's).
Also improve bootstrap.py's config.toml 'parsing' to support arbitrary verbosity levels, + allow command line to override it.