1
Fork 0

Parse tool name for command line lint options

This commit is contained in:
Eric Holk 2021-06-24 16:38:32 -07:00
parent 65b28a987b
commit 1e0db4cfed
3 changed files with 44 additions and 3 deletions

View file

@ -334,9 +334,16 @@ impl LintStore {
}
}
/// Checks the validity of lint names derived from the command line
pub fn check_lint_name_cmdline(&self, sess: &Session, lint_name: &str, level: Level) {
let db = match self.check_lint_name(lint_name, None) {
/// Checks the validity of lint names derived from the command line. Returns
/// true if the lint is valid, false otherwise.
pub fn check_lint_name_cmdline(
&self,
sess: &Session,
lint_name: &str,
level: Option<Level>,
) -> bool {
let (tool_name, lint_name) = parse_lint_and_tool_name(lint_name);
let db = match self.check_lint_name(lint_name, tool_name) {
CheckLintNameResult::Ok(_) => None,
CheckLintNameResult::Warning(ref msg, _) => Some(sess.struct_warn(msg)),
CheckLintNameResult::NoLint(suggestion) => {
@ -1018,3 +1025,10 @@ impl<'tcx> LayoutOf for LateContext<'tcx> {
self.tcx.layout_of(self.param_env.and(ty))
}
}
pub fn parse_lint_and_tool_name(lint_name: &str) -> (Option<Symbol>, &str) {
match lint_name.split_once("::") {
Some((tool_name, lint_name)) => (Some(Symbol::intern(tool_name)), lint_name),
None => (None, lint_name),
}
}

View file

@ -494,3 +494,6 @@ fn register_internals(store: &mut LintStore) {
],
);
}
#[cfg(test)]
mod tests;

View file

@ -0,0 +1,24 @@
use crate::context::parse_lint_and_tool_name;
use rustc_span::{with_default_session_globals, Symbol};
#[test]
fn parse_lint_no_tool() {
with_default_session_globals(|| assert_eq!(parse_lint_and_tool_name("foo"), (None, "foo")));
}
#[test]
fn parse_lint_with_tool() {
with_default_session_globals(|| {
assert_eq!(parse_lint_and_tool_name("clippy::foo"), (Some(Symbol::intern("clippy")), "foo"))
});
}
#[test]
fn parse_lint_multiple_path() {
with_default_session_globals(|| {
assert_eq!(
parse_lint_and_tool_name("clippy::foo::bar"),
(Some(Symbol::intern("clippy")), "foo::bar")
)
});
}