Merge pull request #3442 from rust-lang/version_ids

Enable rustup clippy to refer to the correct documentation
rust-lang · Nov 22, 2018 · 2f6881c · 2f6881c
2 parents 42da194 + 87ec058
commit 2f6881c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs
@@ -539,8 +539,11 @@ impl<'a> DiagnosticWrapper<'a> {
     fn docs_link(&mut self, lint: &'static Lint) {
         if env::var("CLIPPY_DISABLE_DOCS_LINKS").is_err() {
             self.0.help(&format!(
-                "for further information visit https://rust-lang.github.io/rust-clippy/v{}/index.html#{}",
-                env!("CARGO_PKG_VERSION"),
+                "for further information visit https://rust-lang.github.io/rust-clippy/{}/index.html#{}",
+                &option_env!("RUST_RELEASE_NUM").map_or("master".to_string(), |n| {
+                    // extract just major + minor version and ignore patch versions
+                    format!("rust-{}", n.rsplitn(2, '.').nth(1).unwrap())
+                }),
                 lint.name_lower().replacen("clippy::", "", 1)
             ));
         }