Update clippy

Author: Manishearth

.travis.yml

@@ -1,6 +1,5 @@
-language: rust
-
-rust: nightly
+dist: xenial
+language: minimal
 
 os:
   - linux
@@ -14,15 +13,27 @@ branches:
     - trying.tmp
     - staging.tmp
 
+cache:
+  directories:
+    - $HOME/.cargo
+before_cache:
+  - cargo install -Z install-upgrade cargo-cache --debug
+  - cargo cache --autoclean
+
 env:
  global:
    - RUST_BACKTRACE=1
    - secure: "OKulfkA5OGd/d1IhvBKzRkHQwMcWjzrzbimo7+5NhkUkWxndAzl+719TB3wWvIh1i2wXXrEXsyZkXM5FtRrHm55v1VKQ5ibjEvFg1w3NIg81iDyoLq186fLqywvxGkOAFPrsePPsBj5USd5xvhwwbrjO6L7/RK6Z8shBwOSc41s="
 
+before_install:
+  - curl -sSL https://sh.rustup.rs | sh -s -- -y --default-toolchain=nightly --profile=minimal
+  - export PATH="$HOME/.cargo/bin:$PATH"
 install:
   - |
-    if [ -z ${INTEGRATION} ]; then
-      rustup component add rustfmt || cargo install --git https://github.com/rust-lang/rustfmt/ --force
+    if [[ -z ${INTEGRATION} ]]; then
+      if ! rustup component add rustfmt; then
+        cargo install -Z install-upgrade --git https://github.com/rust-lang/rustfmt --bin rustfmt
+      fi
       if [ "$TRAVIS_OS_NAME" == "linux" ]; then
         . $HOME/.nvm/nvm.sh
         nvm install stable

appveyor.yml

@@ -13,12 +13,18 @@ branches:
       - auto
       - try
 
+cache:
+    - '%USERPROFILE%\.cargo'
+on_finish:
+    - cargo install -Z install-upgrade cargo-cache --debug
+    - cargo cache --autoclean
+
 install:
     - curl -sSf -o rustup-init.exe https://win.rustup.rs/
-    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly
+    - rustup-init.exe -y --default-host %TARGET% --default-toolchain nightly --profile=minimal
     - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
     - del rust-toolchain
-    - cargo install rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
+    - cargo install -Z install-upgrade rustup-toolchain-install-master --debug || echo "rustup-toolchain-install-master already installed"
     - rustup-toolchain-install-master -f -n master
     - rustup component add rustfmt --toolchain nightly & exit 0 # Format test handles missing rustfmt
     - rustup default master

clippy_lints/src/lib.rs

@@ -37,6 +37,8 @@ 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 toml;

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::ext::hygiene::MacroKind;
+    use syntax_expand::hygiene::MacroKind;
     if expr.span.from_expansion() {
         let data = expr.span.ctxt().outer_expn_data();
 

clippy_lints/src/types.rs

@@ -17,10 +17,10 @@ use rustc_target::spec::abi::Abi;
 use rustc_typeck::hir_ty_to_ty;
 use syntax::ast::{FloatTy, IntTy, LitIntType, LitKind, UintTy};
 use syntax::errors::DiagnosticBuilder;
-use syntax::ext::base::MacroKind;
-use syntax::ext::hygiene::ExpnKind;
 use syntax::source_map::Span;
 use syntax::symbol::{sym, Symbol};
+use syntax_expand::base::MacroKind;
+use syntax_expand::hygiene::ExpnKind;
 
 use crate::consts::{constant, Constant};
 use crate::utils::paths;

clippy_lints/src/utils/mod.rs

@@ -43,9 +43,9 @@ use rustc_errors::Applicability;
 use smallvec::SmallVec;
 use syntax::ast::{self, LitKind};
 use syntax::attr;
-use syntax::ext::hygiene::ExpnKind;
 use syntax::source_map::{Span, DUMMY_SP};
 use syntax::symbol::{kw, Symbol};
+use syntax_expand::hygiene::ExpnKind;
 
 use crate::consts::{constant, Constant};
 use crate::reexport::*;

setup-toolchain.sh

@@ -7,6 +7,7 @@ cd "$(dirname "$0")" || exit
 
 if ! command -v rustup-toolchain-install-master > /dev/null; then
   cargo install \
+    -Z install-upgrade \
     rustup-toolchain-install-master \
     --bin rustup-toolchain-install-master \
     --debug