Skip to content

Rollup of 7 pull requests #92571

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

Closed
wants to merge 20 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
91fe2d0
Clean up NestedAttributesExt trait/implementation
vacuus Dec 22, 2021
81bf978
Add test for old ICE
BGR360 Dec 27, 2021
71eedb3
Add test for old ICE in #91594
BGR360 Dec 27, 2021
1773e83
Add another implementation example to Debug trait
alper Dec 27, 2021
db27403
Add test for old ICE in #89066
BGR360 Dec 27, 2021
4145877
Explicitly pass `PATH` to the Windows exe resolver
ChrisDenton Jan 3, 2022
10e3d92
Label more build steps.
nnethercote Dec 21, 2021
2e74ca1
Tweak the usage messages for `x.py build` and `x.py check`.
nnethercote Dec 21, 2021
6152d15
Extract init_env_logger to crate
dtolnay Jan 4, 2022
dd5ee32
Justify why rustc_log exists
dtolnay Jan 4, 2022
ffbeebb
Make rustc_log doc test runnable
dtolnay Jan 4, 2022
4df1a55
Touch up Debug example from PR 92322
dtolnay Jan 4, 2022
0286ae4
Ignore flaky `panic-short-backtrace-windows-x86_64.rs` test for now
camelid Jan 2, 2022
152e1e5
Rollup merge of #92182 - nnethercote:label-more-build-steps, r=Mark-S…
matthiaskrgr Jan 5, 2022
edf5d1a
Rollup merge of #92188 - vacuus:nested-attributes-ext, r=jyn514
matthiaskrgr Jan 5, 2022
2e0b081
Rollup merge of #92312 - BGR360:needs-test, r=Mark-Simulacrum
matthiaskrgr Jan 5, 2022
b42ea50
Rollup merge of #92322 - alper:add_debug_trait_documentation, r=dtolnay
matthiaskrgr Jan 5, 2022
2285e2b
Rollup merge of #92498 - camelid:ignore-flaky-test, r=Mark-Simulacrum
matthiaskrgr Jan 5, 2022
d1f0678
Rollup merge of #92517 - ChrisDenton:explicit-path, r=dtolnay
matthiaskrgr Jan 5, 2022
f6fa9ef
Rollup merge of #92545 - dtolnay:rustlog, r=petrochenkov
matthiaskrgr Jan 5, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tweak the usage messages for x.py build and x.py check.
They're a bit out of date, and overly complicated.
  • Loading branch information
nnethercote committed Jan 3, 2022
commit 2e74ca18e43cbaa11300f24cfa0571d7c44d175e
34 changes: 11 additions & 23 deletions src/bootstrap/flags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -401,26 +401,19 @@ To learn more about a subcommand, run `./x.py <subcommand> -h`",
"\n
Arguments:
This subcommand accepts a number of paths to directories to the crates
and/or artifacts to compile. For example:

./x.py build library/core
./x.py build library/core library/proc_macro
./x.py build library/std --stage 1

If no arguments are passed then the complete artifacts for that stage are
also compiled.
and/or artifacts to compile. For example, for a quick build of a usable
compiler:

./x.py build
./x.py build --stage 1
./x.py build --stage 1 library/std

For a quick build of a usable compiler, you can pass:
This will build a compiler and standard library from the local source code.
Once this is done, build/$ARCH/stage1 contains a usable compiler.

./x.py build --stage 1 library/test
If no arguments are passed then the default artifacts for that stage are
compiled. For example:

This will first build everything once (like `--stage 0` without further
arguments would), and then use the compiler built in stage 0 to build
library/test and its dependencies.
Once this is done, build/$ARCH/stage1 contains a usable compiler.",
./x.py build --stage 0
./x.py build ",
);
}
"check" | "c" => {
Expand All @@ -430,14 +423,9 @@ Arguments:
This subcommand accepts a number of paths to directories to the crates
and/or artifacts to compile. For example:

./x.py check library/core
./x.py check library/core library/proc_macro
./x.py check library/std

If no arguments are passed then the complete artifacts are compiled: std, test, and rustc. Note
also that since we use `cargo check`, by default this will automatically enable incremental
compilation, so there's no need to pass it separately, though it won't hurt. We also completely
ignore the stage passed, as there's no way to compile in non-stage 0 without actually building
the compiler.",
If no arguments are passed then many artifacts are checked.",
);
}
"clippy" => {
Expand Down