about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2019-10-28 09:02:48 +0100
committerMatthias Krüger <matthias.krueger@famsik.de>2019-10-28 15:15:28 +0100
commitece5f862c4326bf3502ed29eb57d5c884e173f6f (patch)
tree1282ca968a95896fcebbf9e286b3fd48caee7d9c
parent66df92aeba64547f3e9600635a30df34b12a11d8 (diff)
downloadrust-ece5f862c4326bf3502ed29eb57d5c884e173f6f.tar.gz
rust-ece5f862c4326bf3502ed29eb57d5c884e173f6f.zip
rustup https://github.com/rust-lang/rust/pull/65792/
-rw-r--r--clippy_lints/src/lib.rs2
-rw-r--r--clippy_lints/src/misc.rs2
-rw-r--r--clippy_lints/src/types.rs3
-rw-r--r--clippy_lints/src/utils/mod.rs2
4 files changed, 3 insertions, 6 deletions
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::*;