Skip to content

Commit

Permalink
Auto merge of #56134 - oli-obk:clippy_documentation, r=nrc
Browse files Browse the repository at this point in the history
Forward rust version number to tools

Clippy uses it to identify the correct documentation to point to

cc @Manishearth @nrc

sibling PR in clippy: rust-lang/rust-clippy#3442
  • Loading branch information
bors committed Nov 21, 2018
2 parents 910ec6d + 33efce1 commit 0b9f19d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/bootstrap/tool.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ use util::{exe, add_lib_path};
use compile;
use native;
use channel::GitInfo;
use channel;
use cache::Interned;
use toolstate::ToolState;

Expand Down Expand Up @@ -240,6 +241,7 @@ pub fn prepare_tool_cargo(

cargo.env("CFG_RELEASE_CHANNEL", &builder.config.channel);
cargo.env("CFG_VERSION", builder.rust_version());
cargo.env("CFG_RELEASE_NUM", channel::CFG_RELEASE_NUM);

let info = GitInfo::new(&builder.config, &dir);
if let Some(sha) = info.sha() {
Expand Down

0 comments on commit 0b9f19d

Please sign in to comment.