From dddb8d2eba04610eca944a659c1906f78d210ab4 Mon Sep 17 00:00:00 2001 From: flip1995 <9744647+flip1995@users.noreply.github.com> Date: Tue, 3 Jul 2018 13:50:48 +0200 Subject: Implementation of tool lints --- src/libsyntax/attr/mod.rs | 11 +++++++++++ src/libsyntax/feature_gate.rs | 2 ++ 2 files changed, 13 insertions(+) (limited to 'src/libsyntax') diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index 4e27d6c1525..f8db62083c7 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -90,6 +90,7 @@ pub fn is_known(attr: &Attribute) -> bool { } const RUST_KNOWN_TOOL: &[&str] = &["clippy", "rustfmt"]; +const RUST_KNOWN_LINT_TOOL: &[&str] = &["clippy"]; pub fn is_known_tool(attr: &Attribute) -> bool { let tool_name = @@ -97,6 +98,12 @@ pub fn is_known_tool(attr: &Attribute) -> bool { RUST_KNOWN_TOOL.contains(&tool_name.as_str().as_ref()) } +pub fn is_known_lint_tool(m_item: &MetaItem) -> bool { + let tool_name = + m_item.ident.segments.iter().next().expect("empty path in meta item").ident.name; + RUST_KNOWN_LINT_TOOL.contains(&tool_name.as_str().as_ref()) +} + impl NestedMetaItem { /// Returns the MetaItem if self is a NestedMetaItemKind::MetaItem. pub fn meta_item(&self) -> Option<&MetaItem> { @@ -290,6 +297,10 @@ impl MetaItem { pub fn is_meta_item_list(&self) -> bool { self.meta_item_list().is_some() } + + pub fn is_scoped(&self) -> bool { + self.ident.segments.len() > 1 + } } impl Attribute { diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 2ae0e669fd0..d0837063514 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -458,6 +458,8 @@ declare_features! ( // Scoped attributes (active, tool_attributes, "1.25.0", Some(44690), None), + // Scoped lints + (active, tool_lints, "1.28.0", Some(44690), None), // allow irrefutable patterns in if-let and while-let statements (RFC 2086) (active, irrefutable_let_patterns, "1.27.0", Some(44495), None), -- cgit 1.4.1-3-g733a5 From c3949009adf7e8a039a1f467cbc6e6b5cf993303 Mon Sep 17 00:00:00 2001 From: flip1995 <9744647+flip1995@users.noreply.github.com> Date: Wed, 4 Jul 2018 14:25:33 +0200 Subject: Improving span of unknown lint tool error message --- src/librustc/lint/levels.rs | 8 ++++---- src/libsyntax/attr/mod.rs | 14 ++++++++------ src/test/compile-fail/unknown-lint-tool-name.rs | 4 ++-- src/test/ui/tool_lints.rs | 15 +++++++++++++++ src/test/ui/tool_lints.stderr | 9 +++++++++ 5 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 src/test/ui/tool_lints.rs create mode 100644 src/test/ui/tool_lints.stderr (limited to 'src/libsyntax') diff --git a/src/librustc/lint/levels.rs b/src/librustc/lint/levels.rs index 6761b7b7492..5bf15b10715 100644 --- a/src/librustc/lint/levels.rs +++ b/src/librustc/lint/levels.rs @@ -222,7 +222,7 @@ impl<'a> LintLevelsBuilder<'a> { continue } }; - if word.is_scoped() { + if let Some(lint_tool) = word.is_scoped() { if !self.sess.features_untracked().tool_lints { feature_gate::emit_feature_err(&sess.parse_sess, "tool_lints", @@ -232,12 +232,12 @@ impl<'a> LintLevelsBuilder<'a> { word.ident)); } - if !attr::is_known_lint_tool(word) { + if !attr::is_known_lint_tool(lint_tool) { span_err!( sess, - word.span, + lint_tool.span, E0710, - "an unknown tool name found in scoped lint: `{}`.", + "an unknown tool name found in scoped lint: `{}`", word.ident ); } diff --git a/src/libsyntax/attr/mod.rs b/src/libsyntax/attr/mod.rs index f8db62083c7..d746ac3c577 100644 --- a/src/libsyntax/attr/mod.rs +++ b/src/libsyntax/attr/mod.rs @@ -98,10 +98,8 @@ pub fn is_known_tool(attr: &Attribute) -> bool { RUST_KNOWN_TOOL.contains(&tool_name.as_str().as_ref()) } -pub fn is_known_lint_tool(m_item: &MetaItem) -> bool { - let tool_name = - m_item.ident.segments.iter().next().expect("empty path in meta item").ident.name; - RUST_KNOWN_LINT_TOOL.contains(&tool_name.as_str().as_ref()) +pub fn is_known_lint_tool(m_item: Ident) -> bool { + RUST_KNOWN_LINT_TOOL.contains(&m_item.as_str().as_ref()) } impl NestedMetaItem { @@ -298,8 +296,12 @@ impl MetaItem { self.meta_item_list().is_some() } - pub fn is_scoped(&self) -> bool { - self.ident.segments.len() > 1 + pub fn is_scoped(&self) -> Option { + if self.ident.segments.len() > 1 { + Some(self.ident.segments[0].ident) + } else { + None + } } } diff --git a/src/test/compile-fail/unknown-lint-tool-name.rs b/src/test/compile-fail/unknown-lint-tool-name.rs index 173803d6030..78b736edceb 100644 --- a/src/test/compile-fail/unknown-lint-tool-name.rs +++ b/src/test/compile-fail/unknown-lint-tool-name.rs @@ -10,7 +10,7 @@ #![feature(tool_lints)] -#![deny(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar`. +#![deny(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar` -#[allow(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar`. +#[allow(foo::bar)] //~ ERROR an unknown tool name found in scoped lint: `foo::bar` fn main() {} diff --git a/src/test/ui/tool_lints.rs b/src/test/ui/tool_lints.rs new file mode 100644 index 00000000000..71f90b17c18 --- /dev/null +++ b/src/test/ui/tool_lints.rs @@ -0,0 +1,15 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +#![feature(tool_lints)] + +#[warn(foo::bar)] +//~^ ERROR an unknown tool name found in scoped lint: `foo::bar` +fn main() {} diff --git a/src/test/ui/tool_lints.stderr b/src/test/ui/tool_lints.stderr new file mode 100644 index 00000000000..16468df7370 --- /dev/null +++ b/src/test/ui/tool_lints.stderr @@ -0,0 +1,9 @@ +error[E0710]: an unknown tool name found in scoped lint: `foo::bar` + --> $DIR/tool_lints.rs:13:8 + | +LL | #[warn(foo::bar)] + | ^^^ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0710`. -- cgit 1.4.1-3-g733a5