-use crate::utils::{snippet_opt, span_help_and_lint, span_lint_and_sugg};
-use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
+use crate::utils::{snippet_opt, span_lint_and_help, span_lint_and_sugg};
+use rustc_ast::ast;
+use rustc_ast::tokenstream::TokenStream;
use rustc_errors::Applicability;
-use syntax::ast;
-use syntax::source_map::Span;
-use syntax::tokenstream::TokenStream;
+use rustc_lint::{EarlyContext, EarlyLintPass};
+use rustc_session::{declare_lint_pass, declare_tool_lint};
+use rustc_span::source_map::Span;
declare_clippy_lint! {
/// **What it does:** Checks for usage of dbg!() macro.
declare_lint_pass!(DbgMacro => [DBG_MACRO]);
impl EarlyLintPass for DbgMacro {
- fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::Mac) {
- if mac.node.path == sym!(dbg) {
- if let Some(sugg) = tts_span(mac.node.tts.clone()).and_then(|span| snippet_opt(cx, span)) {
+ fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::MacCall) {
+ if mac.path == sym!(dbg) {
+ if let Some(sugg) = tts_span(mac.args.inner_tokens()).and_then(|span| snippet_opt(cx, span)) {
span_lint_and_sugg(
cx,
DBG_MACRO,
- mac.span,
+ mac.span(),
"`dbg!` macro is intended as a debugging tool",
"ensure to avoid having uses of it in version control",
sugg,
Applicability::MaybeIncorrect,
);
} else {
- span_help_and_lint(
+ span_lint_and_help(
cx,
DBG_MACRO,
- mac.span,
+ mac.span(),
"`dbg!` macro is intended as a debugging tool",
+ None,
"ensure to avoid having uses of it in version control",
);
}
fn tts_span(tts: TokenStream) -> Option<Span> {
let mut cursor = tts.into_trees();
let first = cursor.next()?.span();
- let span = match cursor.last() {
- Some(tree) => first.to(tree.span()),
- None => first,
- };
+ let span = cursor.last().map_or(first, |tree| first.to(tree.span()));
Some(span)
}