diff options
| author | bors <bors@rust-lang.org> | 2020-05-29 11:16:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-29 11:16:45 +0000 |
| commit | 96dd4690c3aa70ec312448c3f2d50e6dc6fb87df (patch) | |
| tree | 8bb30b794419fdd2974d3d5132f5ef190a574f61 /src/bootstrap | |
| parent | 77f95a89a108d4cd6ad1230fb210b3640952b146 (diff) | |
| parent | 3f3e0ee4b0404eba45c106849ed6eae7104039f6 (diff) | |
| download | rust-96dd4690c3aa70ec312448c3f2d50e6dc6fb87df.tar.gz rust-96dd4690c3aa70ec312448c3f2d50e6dc6fb87df.zip | |
Auto merge of #72671 - flip1995:clippyup, r=Xanewok
Update Clippy, RLS, and rustfmt r? @Dylan-DPC This makes Clippy test-pass again: 3089c3b Otherwise this includes bugfixes and a few new lints. Fixes #72231 Fixes #72232
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 8ebad95ea17..5f58f00a2a2 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -252,6 +252,10 @@ pub fn prepare_tool_cargo( // own copy cargo.env("LZMA_API_STATIC", "1"); + // CFG_RELEASE is needed by rustfmt (and possibly other tools) which + // import rustc-ap-rustc_attr which requires this to be set for the + // `#[cfg(version(...))]` attribute. + cargo.env("CFG_RELEASE", builder.rust_release()); cargo.env("CFG_RELEASE_CHANNEL", &builder.config.channel); cargo.env("CFG_VERSION", builder.rust_version()); cargo.env("CFG_RELEASE_NUM", channel::CFG_RELEASE_NUM); |