From 246a77ebe8c9d640c76a82f3869c5272ba51346d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Thu, 15 Nov 2018 16:50:28 +0100 Subject: [PATCH 1/3] rustup https://github.com/rust-lang/rust/pull/55852/ --- clippy_lints/src/misc_early.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy_lints/src/misc_early.rs b/clippy_lints/src/misc_early.rs index a2fd487078e8..1f5973dad163 100644 --- a/clippy_lints/src/misc_early.rs +++ b/clippy_lints/src/misc_early.rs @@ -216,7 +216,7 @@ impl EarlyLintPass for MiscEarly { } } - fn check_pat(&mut self, cx: &EarlyContext<'_>, pat: &Pat) { + fn check_pat(&mut self, cx: &EarlyContext<'_>, pat: &Pat, _: &mut bool) { if let PatKind::Struct(ref npat, ref pfields, _) = pat.node { let mut wilds = 0; let type_name = npat.segments From 2e26fdc2a86f03771a31b8a1e1a35cf8397cb69b Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Wed, 21 Nov 2018 13:33:42 +0100 Subject: [PATCH 2/3] Enable rustup clippy to refer to the correct documentation --- clippy_lints/src/utils/mod.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 05356f8d3856..410819136bc2 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -507,8 +507,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-nursery.github.io/rust-clippy/v{}/index.html#{}", - env!("CARGO_PKG_VERSION"), + "for further information visit https://rust-lang-nursery.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) )); } From fd05696b9d8a42e4c7c44375795c280fae57c115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20S=CC=B6c=CC=B6h=CC=B6n=CC=B6e=CC=B6i=CC=B6d=CC=B6?= =?UTF-8?q?e=CC=B6r=20Scherer?= Date: Mon, 26 Nov 2018 13:39:09 +0100 Subject: [PATCH 3/3] Update mod.rs --- clippy_lints/src/utils/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 410819136bc2..b54f64dacf3a 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -507,7 +507,7 @@ 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-nursery.github.io/rust-clippy/{}/index.html#{}", + "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())