From ece5f862c4326bf3502ed29eb57d5c884e173f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Mon, 28 Oct 2019 09:02:48 +0100
Subject: [PATCH 1/2] rustup https://github.com/rust-lang/rust/pull/65792/

---
 clippy_lints/src/lib.rs       | 2 --
 clippy_lints/src/misc.rs      | 2 +-
 clippy_lints/src/types.rs     | 3 +--
 clippy_lints/src/utils/mod.rs | 2 +-
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/clippy_lints/src/lib.rs b/clippy_lints/src/lib.rs
index 717451903243..817575092cc5 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 84afda30768c..e7197b671c9e 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 ab29060cc364..6c1e0b808d9f 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 417f7677bbd3..5729c8c2967a 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::*;

From 407e5a000a9efe00d4cba3d9f37198ae7dd6bcf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= <matthias.krueger@famsik.de>
Date: Mon, 28 Oct 2019 10:46:54 +0100
Subject: [PATCH 2/2] travis: temporarily disable rustfmt ci check until #4742
 is resolved

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64036ec3aa3a..862a6a79cc09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -63,8 +63,9 @@ matrix:
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=Geal/nom
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rustfmt
-      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
+    # FIXME blocked on https://github.com/rust-lang/rust-clippy/issues/4742
+    #- env: INTEGRATION=rust-lang/rustfmt
+    #  if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=hyperium/hyper
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=bluss/rust-itertools