bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Cleanup: unify lint name checking

Browse source 
This change merges `check_lint_and_tool_name` into `check_lint_name` in
order to avoid having two very similar functions.

Also adds the `.stderr` file back for the test case, since apparently
it is still needed.
This commit is contained in:
Eric Holk 2021-07-07 10:50:50 -07:00
parent 5413d2e529
commit 4a83a93e9a
3 changed files with 25 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

28
compiler/rustc_lint/src/context.rs
View file

@ -344,9 +344,9 @@ impl LintStore {
level: Level,
crate_attrs: &[ast::Attribute],
) {
let (tool_name, lint_name) = parse_lint_and_tool_name(lint_name);
let (tool_name, lint_name_only) = parse_lint_and_tool_name(lint_name);
let db = match self.check_lint_and_tool_name(sess, tool_name, lint_name, crate_attrs) {
let db = match self.check_lint_name(sess, lint_name_only, tool_name, crate_attrs) {
CheckLintNameResult::Ok(_) => None,
CheckLintNameResult::Warning(ref msg, _) => Some(sess.struct_warn(msg)),
CheckLintNameResult::NoLint(suggestion) => {
@ -408,22 +408,6 @@ impl LintStore {
}
}
pub fn check_lint_and_tool_name(
&self,
sess: &Session,
tool_name: Option<Symbol>,
lint_name: &str,
crate_attrs: &[ast::Attribute],
) -> CheckLintNameResult<'_> {
if let Some(tool_name) = tool_name {
if !is_known_lint_tool(tool_name, sess, crate_attrs) {
return CheckLintNameResult::NoTool;
}
}
self.check_lint_name(lint_name, tool_name)
}
/// Checks the name of a lint for its existence, and whether it was
/// renamed or removed. Generates a DiagnosticBuilder containing a
/// warning for renamed and removed lints. This is over both lint
@ -433,9 +417,17 @@ impl LintStore {
/// printing duplicate warnings.
pub fn check_lint_name(
&self,
sess: &Session,
lint_name: &str,
tool_name: Option<Symbol>,
crate_attrs: &[ast::Attribute],
) -> CheckLintNameResult<'_> {
if let Some(tool_name) = tool_name {
if !is_known_lint_tool(tool_name, sess, crate_attrs) {
return CheckLintNameResult::NoTool;
}
}
let complete_name = if let Some(tool_name) = tool_name {
format!("{}::{}", tool_name, lint_name)
} else {