Skip to content
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

Rollup of 13 pull requests #87689

Merged
merged 61 commits into from
Aug 2, 2021
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
d67f1a4
Update log to 0.4.14
jyn514 May 2, 2021
e243be6
Allow formatting `Anonymous{Struct, Union}` declarations
jedel1043 May 17, 2021
58c63cf
Add support for using qualified paths with structs in expression and …
rylev Dec 10, 2020
1e2258f
Use `AttrVec` for `Arm`, `FieldDef`, and `Variant`
JohnTitor Jun 16, 2021
2608f2c
fix(rustfmt): load nested out-of-line mods correctly
calebcartwright Jun 18, 2021
a26237e
Remove `Ipv4Addr::is_ietf_protocol_assignment`
CDirkx Jun 18, 2021
71f01d1
Delete spaces
Jun 21, 2021
d13020c
Rollup merge of #86274 - alexander-melentyev:spaces, r=bjorn3
JohnTitor Jun 21, 2021
0b8a26f
Rollup merge of #86424 - calebcartwright:rustfmt-mod-resolution, r=Ma…
JohnTitor Jun 21, 2021
5d85130
Partially stabilize `const_slice_first_last`
jhpratt Jun 24, 2021
33acc96
Document rustfmt on nightly-rustc
jyn514 Jun 30, 2021
c93cb40
Move `os_str_bytes` to `sys::unix` and reuse it on other platforms.
CDirkx Jun 21, 2021
f2c0f29
Change env var getters to error recoverably
inquisitivecrystal Jun 9, 2021
d26e01e
Add test to prevent regression
inquisitivecrystal Jun 9, 2021
a12107a
Make `getenv` return an Option instead of a Result
inquisitivecrystal Jun 24, 2021
d9752c7
Improve env var getter docs
inquisitivecrystal Jul 6, 2021
a674ae6
Add documentation for `Ipv6MulticastScope`
CDirkx Jul 7, 2021
abf449f
Rework SESSION_GLOBALS API to prevent overwriting it
GuillaumeGomez May 5, 2021
277feac
Use LocalExpnId where possible.
cjgillot Jun 25, 2021
8f3844f
refactor adding rustc and std into extended builds
pietroalbini Jul 19, 2021
0c8baa7
refactor gating of dist docs
pietroalbini Jul 19, 2021
7167f8b
change output of dist cargo and clippy to be consistent with other tools
pietroalbini Jul 19, 2021
e60b348
refactor gating of tools
pietroalbini Jul 19, 2021
82faa9c
refactor gating of demangler
pietroalbini Jul 19, 2021
f4c6d8f
refactor gating of mingw
pietroalbini Jul 19, 2021
2cfac3f
don't build extra tools if build.tools is explicitly an empty list
pietroalbini Jul 23, 2021
c15e248
refactor extended tarball generaton to use the new ensure_if_default
pietroalbini Jul 23, 2021
bfd479d
Merge pull request #4920 from calebcartwright/subtree-sync
calebcartwright Jul 26, 2021
75765f6
Allow `--edition 2021` to be passed to rustfmt
PatchMixolydic May 22, 2021
1ca3798
Improve pasta copyability of `merge_imports` deprecation message
casey May 10, 2021
486e774
Adjusting help message (#4865)
murchu27 Jun 11, 2021
e634a6f
Updating outdated links (#4869)
murchu27 Jun 16, 2021
b305d62
fix: correct arm leading pipe check (#4880)
calebcartwright Jun 24, 2021
19733f1
Change line endings from CRLF to LF
Jun 25, 2021
2cf280e
docs: clarify match_arm_blocks config documentation
calebcartwright Jul 5, 2021
4c2959f
fix a bunch of clippy warnings
matthiaskrgr Jul 18, 2021
d42be80
chore: disable clippy::matches_like_macro lint
calebcartwright Jul 18, 2021
0832137
fix link in Contributing.md
ebobrow Jul 19, 2021
4236289
chore: bump toolchain
calebcartwright Jul 26, 2021
102a06b
Merge commit '4236289b75ee55c78538c749512cdbeea5e1c332' into update-r…
calebcartwright Jul 26, 2021
661f461
Update mdbook.
ehuss Jul 27, 2021
69f712c
set all of the optional tools as DEFAULT = true
pietroalbini Jul 28, 2021
377b4ce
Remove unused field `Session.system_library_path`
Aaron1011 Jul 29, 2021
8d2bb93
Consistent spelling of "adapter" in the standard library
steffahn Jul 30, 2021
12017f9
Update compiler_builtins to fix i128 shift/mul on thumbv6m
Amanieu Jul 30, 2021
9a2e3f3
Recommend `swap_remove` in `Vec::remove` docs
Flying-Toast Jul 30, 2021
6aaa832
mark a UB doctest as no_run
RalfJung Jul 31, 2021
9854d30
Update const_slice_first_last_not_mut stable version.
m-ou-se Aug 1, 2021
016612d
Rollup merge of #86183 - inquisitivecrystal:env-nul, r=m-ou-se
JohnTitor Aug 2, 2021
a03d6da
Rollup merge of #86439 - CDirkx:ip-protocol-assignment, r=m-ou-se
JohnTitor Aug 2, 2021
1176d30
Rollup merge of #86509 - CDirkx:os_str, r=m-ou-se
JohnTitor Aug 2, 2021
77d5683
Rollup merge of #86593 - jhpratt:stabilize-const_slice_first_last, r=…
JohnTitor Aug 2, 2021
f386ae3
Rollup merge of #86936 - CDirkx:ipv6-multicast, r=JohnTitor
JohnTitor Aug 2, 2021
46f01ca
Rollup merge of #87282 - pietroalbini:refactor-extended, r=Mark-Simul…
JohnTitor Aug 2, 2021
e95b0ff
Rollup merge of #87468 - calebcartwright:update-rustfmt, r=Mark-Simul…
JohnTitor Aug 2, 2021
0d747d0
Rollup merge of #87504 - ehuss:update-mdbook, r=Mark-Simulacrum
JohnTitor Aug 2, 2021
5cf6566
Rollup merge of #87608 - Aaron1011:remove-system-library, r=Mark-Simu…
JohnTitor Aug 2, 2021
87c1436
Rollup merge of #87629 - steffahn:consistent_adapter_spelling, r=m-ou-se
JohnTitor Aug 2, 2021
e924e76
Rollup merge of #87633 - Amanieu:fix-86063, r=Mark-Simulacrum
JohnTitor Aug 2, 2021
0c9b35b
Rollup merge of #87644 - Flying-Toast:vec-remove-note, r=the8472
JohnTitor Aug 2, 2021
0851841
Rollup merge of #87653 - RalfJung:dont-run-ub, r=kennytm
JohnTitor Aug 2, 2021
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
don't build extra tools if build.tools is explicitly an empty list
pietroalbini committed Jul 23, 2021
commit 2cfac3f04599ab50f1a7b6e21bb98c02b53bba75
7 changes: 1 addition & 6 deletions src/bootstrap/dist.rs
Original file line number Diff line number Diff line change
@@ -50,12 +50,7 @@ fn should_build_extended_tool(builder: &Builder<'_>, tool: &str) -> bool {
if !builder.config.extended {
return false;
}

if let Some(tools) = &builder.config.tools {
tools.is_empty() || tools.contains(tool)
} else {
true
}
builder.config.tools.as_ref().map_or(true, |tools| tools.contains(tool))
}

#[derive(Debug, PartialOrd, Ord, Copy, Clone, Hash, PartialEq, Eq)]