Auto merge of #4938 - flip1995:rustup, r=flip1995

[rust.git] / clippy_lints / src / dbg_macro.rs

diff --git a/clippy_lints/src/dbg_macro.rs b/clippy_lints/src/dbg_macro.rs
index ff76b35fa21bdc98be291bb50b5e4f480e16b226..48fc601e726cf6ef35c86b8192c3708731b8f2cc 100644 (file)
--- a/clippy_lints/src/dbg_macro.rs
+++ b/clippy_lints/src/dbg_macro.rs
@@ -1,7 +1,8 @@
 use crate::utils::{snippet_opt, span_help_and_lint, span_lint_and_sugg};
+use rustc::declare_lint_pass;
 use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintPass};
-use rustc::{declare_lint_pass, declare_tool_lint};
 use rustc_errors::Applicability;
+use rustc_session::declare_tool_lint;
 use syntax::ast;
 use syntax::source_map::Span;
 use syntax::tokenstream::TokenStream;
@@ -31,12 +32,12 @@
 
 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)) {
+        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,
@@ -46,7 +47,7 @@ fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::Mac) {
                 span_help_and_lint(
                     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",
                 );
@@ -59,9 +60,6 @@ fn check_mac(&mut self, cx: &EarlyContext<'_>, mac: &ast::Mac) {
 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)
 }