bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Tweak CheckLintNameResult::Tool.

Browse source 
It has a clumsy type, with repeated `&'a [LintId]`, and sometimes
requires an empty string that isn't used in the `Err`+`None` case.

This commit splits it into two variants.
This commit is contained in:
Nicholas Nethercote 2024-05-07 14:37:57 +10:00
parent d070e89230
commit 32c8a12854
2 changed files with 46 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -127,12 +127,16 @@ pub enum CheckLintNameResult<'a> {
Renamed(String), Renamed(String),
/// The lint has been removed due to the given reason. /// The lint has been removed due to the given reason.
Removed(String), Removed(String),
/// The lint is from a tool. If the Option is None, then either
/// the lint does not exist in the tool or the code was not /// The lint is from a tool. The `LintId` will be returned as if it were a
/// compiled with the tool and therefore the lint was never /// rustc lint. The `Option<String>` indicates if the lint has been
/// added to the `LintStore`. Otherwise the `LintId` will be /// renamed.
/// returned as if it where a rustc lint. Tool(&'a [LintId], Option<String>),
Tool(Result<&'a [LintId], (Option<&'a [LintId]>, String)>),
/// The lint is from a tool. Either the lint does not exist in the tool or
/// the code was not compiled with the tool and therefore the lint was
/// never added to the `LintStore`.
MissingTool,
} }
impl LintStore { impl LintStore {
@ -385,14 +389,14 @@ impl LintStore {
} else { } else {
// 2. The tool isn't currently running, so no lints will be registered. // 2. The tool isn't currently running, so no lints will be registered.
// To avoid giving a false positive, ignore all unknown lints. // To avoid giving a false positive, ignore all unknown lints.
CheckLintNameResult::Tool(Err((None, String::new()))) CheckLintNameResult::MissingTool
}; };
} }
Some(LintGroup { lint_ids, .. }) => { Some(LintGroup { lint_ids, .. }) => {
return CheckLintNameResult::Tool(Ok(lint_ids)); return CheckLintNameResult::Tool(lint_ids, None);
} }
}, },
Some(Id(id)) => return CheckLintNameResult::Tool(Ok(slice::from_ref(id))), Some(Id(id)) => return CheckLintNameResult::Tool(slice::from_ref(id), None),
// If the lint was registered as removed or renamed by the lint tool, we don't need // If the lint was registered as removed or renamed by the lint tool, we don't need
// to treat tool_lints and rustc lints different and can use the code below. // to treat tool_lints and rustc lints different and can use the code below.
_ => {} _ => {}
@ -412,7 +416,7 @@ impl LintStore {
return if *silent { return if *silent {
CheckLintNameResult::Ok(lint_ids) CheckLintNameResult::Ok(lint_ids)
} else { } else {
CheckLintNameResult::Tool(Err((Some(lint_ids), (*name).to_string()))) CheckLintNameResult::Tool(lint_ids, Some((*name).to_string()))
}; };
} }
CheckLintNameResult::Ok(lint_ids) CheckLintNameResult::Ok(lint_ids)
@ -473,18 +477,17 @@ impl LintStore {
// Reaching this would be weird, but let's cover this case anyway // Reaching this would be weird, but let's cover this case anyway
if let Some(LintAlias { name, silent }) = depr { if let Some(LintAlias { name, silent }) = depr {
let LintGroup { lint_ids, .. } = self.lint_groups.get(name).unwrap(); let LintGroup { lint_ids, .. } = self.lint_groups.get(name).unwrap();
return if *silent { if *silent {
CheckLintNameResult::Tool(Err((Some(lint_ids), complete_name))) CheckLintNameResult::Tool(lint_ids, Some(complete_name))
} else { } else {
CheckLintNameResult::Tool(Err((Some(lint_ids), (*name).to_string()))) CheckLintNameResult::Tool(lint_ids, Some((*name).to_string()))
}; }
} else {
CheckLintNameResult::Tool(lint_ids, Some(complete_name))
} }
CheckLintNameResult::Tool(Err((Some(lint_ids), complete_name)))
} }
}, },
Some(Id(id)) => { Some(Id(id)) => CheckLintNameResult::Tool(slice::from_ref(id), Some(complete_name)),
CheckLintNameResult::Tool(Err((Some(slice::from_ref(id)), complete_name)))
}
Some(other) => { Some(other) => {
debug!("got renamed lint {:?}", other); debug!("got renamed lint {:?}", other);
CheckLintNameResult::NoLint(None) CheckLintNameResult::NoLint(None)

62
compiler/rustc_lint/src/levels.rs
View file

@ -593,7 +593,7 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
let lint = UnknownLintFromCommandLine { name, suggestion, requested_level }; let lint = UnknownLintFromCommandLine { name, suggestion, requested_level };
self.emit_lint(UNKNOWN_LINTS, lint); self.emit_lint(UNKNOWN_LINTS, lint);
} }
CheckLintNameResult::Tool(Err((Some(_), ref replace))) => { CheckLintNameResult::Tool(_, Some(ref replace)) => {
let name = lint_name.clone(); let name = lint_name.clone();
let requested_level = RequestedLevel { level, lint_name }; let requested_level = RequestedLevel { level, lint_name };
let lint = DeprecatedLintNameFromCommandLine { name, replace, requested_level }; let lint = DeprecatedLintNameFromCommandLine { name, replace, requested_level };
@ -902,17 +902,35 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
} }
} }
CheckLintNameResult::Tool(result) => { CheckLintNameResult::Tool(ids, new_lint_name) => {
match *result { let src = match new_lint_name {
Ok(ids) => { None => {
let complete_name = let complete_name =
&format!("{}::{}", tool_ident.unwrap().name, name); &format!("{}::{}", tool_ident.unwrap().name, name);
let src = LintLevelSource::Node { LintLevelSource::Node {
name: Symbol::intern(complete_name), name: Symbol::intern(complete_name),
span: sp, span: sp,
reason, reason,
}
}
Some(new_lint_name) => {
self.emit_span_lint(
builtin::RENAMED_AND_REMOVED_LINTS,
sp.into(),
DeprecatedLintName {
name,
suggestion: sp,
replace: new_lint_name,
},
);
LintLevelSource::Node {
name: Symbol::intern(new_lint_name),
span: sp,
reason,
}
}
}; };
for &id in ids { for &id in *ids {
if self.check_gated_lint(id, attr.span, false) { if self.check_gated_lint(id, attr.span, false) {
self.insert_spec(id, (level, src)); self.insert_spec(id, (level, src));
} }
@ -924,41 +942,13 @@ impl<'s, P: LintLevelsProvider> LintLevelsBuilder<'s, P> {
); );
} }
} }
Err((Some(ids), ref new_lint_name)) => {
let lint = builtin::RENAMED_AND_REMOVED_LINTS;
self.emit_span_lint(
lint,
sp.into(),
DeprecatedLintName {
name,
suggestion: sp,
replace: new_lint_name,
},
);
let src = LintLevelSource::Node { CheckLintNameResult::MissingTool => {
name: Symbol::intern(new_lint_name), // If `MissingTool` is returned, then either the lint does not
span: sp,
reason,
};
for id in ids {
self.insert_spec(*id, (level, src));
}
if let Level::Expect(expect_id) = level {
self.provider.push_expectation(
expect_id,
LintExpectation::new(reason, sp, false, tool_name),
);
}
}
Err((None, _)) => {
// If Tool(Err(None, _)) is returned, then either the lint does not
// exist in the tool or the code was not compiled with the tool and // exist in the tool or the code was not compiled with the tool and
// therefore the lint was never added to the `LintStore`. To detect // therefore the lint was never added to the `LintStore`. To detect
// this is the responsibility of the lint tool. // this is the responsibility of the lint tool.
} }
}
}
&CheckLintNameResult::NoTool => { &CheckLintNameResult::NoTool => {
sess.dcx().emit_err(UnknownToolInScopedLint { sess.dcx().emit_err(UnknownToolInScopedLint {