From 0214b6aef4ae08a4bfdc45ef5d8e1cf26da6159f Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Wed, 21 Nov 2018 14:27:30 +0100 Subject: [PATCH 1/2] Forward rust version number to tools Clippy uses it to identify the correct documentation to point to --- src/bootstrap/tool.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 15d27c613423a..6868a063ce58f 100644 --- a/src/bootstrap/tool.rs +++ b/src/bootstrap/tool.rs @@ -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; @@ -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() { From 0a3a6855682147d5f7e11457c7be279ea14091d9 Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Thu, 22 Nov 2018 10:47:19 +0100 Subject: [PATCH 2/2] Update clippy submodule --- src/tools/clippy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/clippy b/src/tools/clippy index 246a77ebe8c9d..2e26fdc2a86f0 160000 --- a/src/tools/clippy +++ b/src/tools/clippy @@ -1 +1 @@ -Subproject commit 246a77ebe8c9d640c76a82f3869c5272ba51346d +Subproject commit 2e26fdc2a86f03771a31b8a1e1a35cf8397cb69b