diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs index 71745190324..817575092cc 100644 --- a/clippy_lints/src/lib.rs +++ b/clippy_lints/src/lib.rs @@ -37,8 +37,6 @@ extern crate rustc_typeck; #[allow(unused_extern_crates)] extern crate syntax; #[allow(unused_extern_crates)] -extern crate syntax_expand; -#[allow(unused_extern_crates)] extern crate syntax_pos; use rustc::lint::{self, LintId}; diff --git a/clippy_lints/src/misc.rs b/clippy_lints/src/misc.rs index 84afda30768..e7197b671c9 100644 --- a/clippy_lints/src/misc.rs +++ b/clippy_lints/src/misc.rs @@ -596,7 +596,7 @@ fn is_used(cx: &LateContext<'_, '_>, expr: &Expr) -> bool { /// Tests whether an expression is in a macro expansion (e.g., something /// generated by `#[derive(...)]` or the like). fn in_attributes_expansion(expr: &Expr) -> bool { - use syntax_expand::hygiene::MacroKind; + use syntax_pos::hygiene::MacroKind; if expr.span.from_expansion() { let data = expr.span.ctxt().outer_expn_data(); diff --git a/clippy_lints/src/types.rs b/clippy_lints/src/types.rs index ab29060cc36..6c1e0b808d9 100644 --- a/clippy_lints/src/types.rs +++ b/clippy_lints/src/types.rs @@ -19,8 +19,7 @@ use syntax::ast::{FloatTy, IntTy, LitIntType, LitKind, UintTy}; use syntax::errors::DiagnosticBuilder; use syntax::source_map::Span; use syntax::symbol::{sym, Symbol}; -use syntax_expand::base::MacroKind; -use syntax_expand::hygiene::ExpnKind; +use syntax_pos::hygiene::{ExpnKind, MacroKind}; use crate::consts::{constant, Constant}; use crate::utils::paths; diff --git a/clippy_lints/src/utils/mod.rs b/clippy_lints/src/utils/mod.rs index 417f7677bbd..5729c8c2967 100644 --- a/clippy_lints/src/utils/mod.rs +++ b/clippy_lints/src/utils/mod.rs @@ -45,7 +45,7 @@ use syntax::ast::{self, LitKind}; use syntax::attr; use syntax::source_map::{Span, DUMMY_SP}; use syntax::symbol::{kw, Symbol}; -use syntax_expand::hygiene::ExpnKind; +use syntax_pos::hygiene::ExpnKind; use crate::consts::{constant, Constant}; use crate::reexport::*;