Update tests and lint logic so that they compile.

Author: xiongmao86

clippy_lints/src/utils/internal_lints.rs

@@ -4,8 +4,10 @@ use crate::utils::{
 };
 use if_chain::if_chain;
 use rustc::hir::map::Map;
-use rustc_ast::ast::{Crate as AstCrate, ItemKind, LitKind, Name, NodeId};
+use rustc_ast::ast;
+use rustc_ast::ast::{Crate as AstCrate, Expr as AstExpr, ItemKind, LitKind, Name, NodeId};
 use rustc_ast::visit::FnKind;
+use rustc_ast::ptr::P;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_errors::Applicability;
 use rustc_hir as hir;
@@ -16,10 +18,8 @@ use rustc_lint::{EarlyContext, EarlyLintPass, LateContext, LateLintPass};
 use rustc_session::{declare_lint_pass, declare_tool_lint, impl_lint_pass};
 use rustc_span::source_map::{Span, Spanned};
 use rustc_span::symbol::SymbolStr;
-use syntax::ast;
-use syntax::ast::{Crate as AstCrate, ItemKind, LitKind, Name, Expr as AstExpr};
-use syntax::ptr::P;
-use syntax::visit::FnKind;
+
+
 use std::borrow::Cow;
 
 declare_clippy_lint! {

tests/ui/collapsible_span_lint_calls.rs

@@ -5,13 +5,13 @@
 extern crate rustc_session;
 extern crate rustc_errors;
 extern crate rustc_lint;
-extern crate syntax;
+extern crate rustc_ast;
 extern crate rustc_span;
 
 use rustc_session::{declare_tool_lint, declare_lint_pass};
 use rustc_errors::{DiagnosticBuilder, Applicability};
 use rustc_lint::{EarlyContext, EarlyLintPass, LintContext, Lint};
-use syntax::ast::Expr;
+use rustc_ast::ast::Expr;
 use rustc_span::source_map::Span;
 
 #[allow(unused_variables)]
@@ -41,11 +41,17 @@ impl EarlyLintPass for Pass {
             db.span_suggestion(expr.span, help_msg, sugg.to_string(), Applicability::MachineApplicable);
         });
         span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
-            db.span_help(expr.span, help_msg)
+            db.span_help(expr.span, help_msg);
         });
-        span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db|
-            db.span_note(expr.span, note_msg)
-        );
+        span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
+            db.span_note(expr.span, note_msg);
+        });
+        span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
+            db.note(note_msg);
+        });
+        span_lint_and_then(cx, TEST_LINT, expr.span, lint_msg, |db| {
+            db.help(help_msg);
+        })
     }
 }