Update clippy

Author: Manishearth

.travis.yml

@@ -13,6 +13,7 @@ cache:
     - $HOME/.cargo
 before_cache:
   - cargo install -Z install-upgrade cargo-cache --debug
+  - find $HOME/.cargo/bin/ ! -type d -exec strip {} \;
   - cargo cache --autoclean
 
 env:
@@ -46,7 +47,6 @@ matrix:
   fast_finish: true
   include:
     # Builds that are executed for every PR
-    - os: osx # run base tests on both platforms
     - os: linux
     - os: windows
       env: CARGO_INCREMENTAL=0 OS_WINDOWS=true
@@ -55,15 +55,17 @@ matrix:
     # We don't want to run these always because they go towards
     # the build limit within the Travis rust-lang account.
     # The jobs are approximately sorted by execution time
+    - os: osx
+      if: branch IN (auto, try)
+    - env: INTEGRATION=rust-lang/rls
+      if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=rust-lang/cargo
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=rust-lang-nursery/chalk
       if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
-    - env: INTEGRATION=rust-lang/rls
-      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)
-    # FIXME blocked on https://github.com/rust-lang/rust-clippy/issues/4742
+    # FIXME blocked on https://github.com/rust-lang/rust-clippy/issues/4727
     #- env: INTEGRATION=rust-lang/rustfmt
     #  if: repo =~ /^rust-lang\/rust-clippy$/ AND branch IN (auto, try)
     - env: INTEGRATION=hyperium/hyper

CHANGELOG.md

@@ -996,6 +996,7 @@ Released 2018-09-13
 [`erasing_op`]: https://rust-lang.github.io/rust-clippy/master/index.html#erasing_op
 [`eval_order_dependence`]: https://rust-lang.github.io/rust-clippy/master/index.html#eval_order_dependence
 [`excessive_precision`]: https://rust-lang.github.io/rust-clippy/master/index.html#excessive_precision
+[`exit`]: https://rust-lang.github.io/rust-clippy/master/index.html#exit
 [`expect_fun_call`]: https://rust-lang.github.io/rust-clippy/master/index.html#expect_fun_call
 [`expl_impl_clone_on_copy`]: https://rust-lang.github.io/rust-clippy/master/index.html#expl_impl_clone_on_copy
 [`explicit_counter_loop`]: https://rust-lang.github.io/rust-clippy/master/index.html#explicit_counter_loop

Cargo.toml

@@ -22,11 +22,6 @@ publish = false
 travis-ci = { repository = "rust-lang/rust-clippy" }
 appveyor = { repository = "rust-lang/rust-clippy" }
 
-[lib]
-name = "clippy"
-plugin = true
-test = false
-
 [[bin]]
 name = "cargo-clippy"
 test = false

ci/integration-tests.sh

@@ -14,16 +14,23 @@ cargo install --force --debug --path .
 echo "Running integration test for crate ${INTEGRATION}"
 
 git clone --depth=1 "https://github.com/${INTEGRATION}.git" checkout
-cd checkout || exit 1
+cd checkout
 
-# run clippy on a project, try to be verbose and trigger as many warnings as possible for greater coverage
+# run clippy on a project, try to be verbose and trigger as many warnings
+# as possible for greater coverage
+# NOTE: we use `tee` to print any warnings and errors to stdout
+#       to avoid build timeout in Travis
 RUST_BACKTRACE=full \
 cargo clippy \
     --all-targets \
     --all-features \
-    -- --cap-lints warn -W clippy::pedantic -W clippy::nursery \
-    2>& 1 \
-| tee clippy_output
+    -- \
+    --cap-lints warn \
+    -W clippy::pedantic \
+    -W clippy::nursery \
+    2>&1 | tee clippy_output
+
+cargo uninstall clippy
 
 if grep -q "internal compiler error\|query stack during panic\|E0463" clippy_output; then
     exit 1

clippy_lints/Cargo.toml

@@ -18,20 +18,21 @@ edition = "2018"
 
 [dependencies]
 cargo_metadata = "0.9.0"
+if_chain = "1.0.0"
 itertools = "0.8"
 lazy_static = "1.0.2"
 matches = "0.1.7"
+pulldown-cmark = "0.6.0"
 quine-mc_cluskey = "0.2.2"
 regex-syntax = "0.6"
-semver = "0.9.0"
 serde = { version = "1.0", features = ["derive"] }
+smallvec = { version = "1", features = ["union"] }
 toml = "0.5.3"
 unicode-normalization = "0.1"
-pulldown-cmark = "0.6.0"
-url = { version =  "2.1.0", features = ["serde"] } # cargo requires serde feat in its url dep
-# see https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864
-if_chain = "1.0.0"
-smallvec = { version = "0.6.5", features = ["union"] }
+semver = "0.9.0"
+# NOTE: cargo requires serde feat in its url dep
+# see <https://github.com/rust-lang/rust/pull/63587#issuecomment-522343864>
+url = { version =  "2.1.0", features = ["serde"] }
 
 [features]
 debugging = []

clippy_lints/src/approx_const.rs

@@ -3,7 +3,7 @@ use rustc::hir::*;
 use rustc::lint::{LateContext, LateLintPass, LintArray, LintPass};
 use rustc::{declare_lint_pass, declare_tool_lint};
 use std::f64::consts as f64;
-use syntax::ast::{FloatTy, LitKind};
+use syntax::ast::{FloatTy, LitFloatType, LitKind};
 use syntax::symbol;
 
 declare_clippy_lint! {
@@ -62,9 +62,11 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for ApproxConstant {
 
 fn check_lit(cx: &LateContext<'_, '_>, lit: &LitKind, e: &Expr) {
     match *lit {
-        LitKind::Float(s, FloatTy::F32) => check_known_consts(cx, e, s, "f32"),
-        LitKind::Float(s, FloatTy::F64) => check_known_consts(cx, e, s, "f64"),
-        LitKind::FloatUnsuffixed(s) => check_known_consts(cx, e, s, "f{32, 64}"),
+        LitKind::Float(s, LitFloatType::Suffixed(fty)) => match fty {
+            FloatTy::F32 => check_known_consts(cx, e, s, "f32"),
+            FloatTy::F64 => check_known_consts(cx, e, s, "f64"),
+        },
+        LitKind::Float(s, LitFloatType::Unsuffixed) => check_known_consts(cx, e, s, "f{32, 64}"),
         _ => (),
     }
 }
@@ -97,14 +99,11 @@ fn check_known_consts(cx: &LateContext<'_, '_>, e: &Expr, s: symbol::Symbol, mod
 fn is_approx_const(constant: f64, value: &str, min_digits: usize) -> bool {
     if value.len() <= min_digits {
         false
+    } else if constant.to_string().starts_with(value) {
+        // The value is a truncated constant
+        true
     } else {
         let round_const = format!("{:.*}", value.len() - 2, constant);
-
-        let mut trunc_const = constant.to_string();
-        if trunc_const.len() > value.len() {
-            trunc_const.truncate(value.len());
-        }
-
-        (value == round_const) || (value == trunc_const)
+        value == round_const
     }
 }

clippy_lints/src/attrs.rs

@@ -15,7 +15,7 @@ use rustc::ty;
 use rustc::{declare_lint_pass, declare_tool_lint};
 use rustc_errors::Applicability;
 use semver::Version;
-use syntax::ast::{AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem};
+use syntax::ast::{AttrKind, AttrStyle, Attribute, Lit, LitKind, MetaItemKind, NestedMetaItem};
 use syntax::source_map::Span;
 use syntax_pos::symbol::Symbol;
 
@@ -355,7 +355,7 @@ fn check_clippy_lint_names(cx: &LateContext<'_, '_>, items: &[NestedMetaItem]) {
 }
 
 fn is_relevant_item(cx: &LateContext<'_, '_>, item: &Item) -> bool {
-    if let ItemKind::Fn(_, _, _, eid) = item.kind {
+    if let ItemKind::Fn(_, _, eid) = item.kind {
         is_relevant_expr(cx, cx.tcx.body_tables(eid), &cx.tcx.hir().body(eid).value)
     } else {
         true
@@ -417,11 +417,14 @@ fn check_attrs(cx: &LateContext<'_, '_>, span: Span, name: Name, attrs: &[Attrib
     }
 
     for attr in attrs {
-        if attr.is_sugared_doc {
-            return;
-        }
+        let attr_item = if let AttrKind::Normal(ref attr) = attr.kind {
+            attr
+        } else {
+            continue;
+        };
+
         if attr.style == AttrStyle::Outer {
-            if attr.tokens.is_empty() || !is_present_in_source(cx, attr.span) {
+            if attr_item.tokens.is_empty() || !is_present_in_source(cx, attr.span) {
                 return;
             }
 

clippy_lints/src/consts.rs

@@ -161,9 +161,11 @@ pub fn lit_to_constant(lit: &LitKind, ty: Option<Ty<'_>>) -> Constant {
         LitKind::ByteStr(ref s) => Constant::Binary(Lrc::clone(s)),
         LitKind::Char(c) => Constant::Char(c),
         LitKind::Int(n, _) => Constant::Int(n),
-        LitKind::Float(ref is, FloatTy::F32) => Constant::F32(is.as_str().parse().unwrap()),
-        LitKind::Float(ref is, FloatTy::F64) => Constant::F64(is.as_str().parse().unwrap()),
-        LitKind::FloatUnsuffixed(ref is) => match ty.expect("type of float is known").kind {
+        LitKind::Float(ref is, LitFloatType::Suffixed(fty)) => match fty {
+            FloatTy::F32 => Constant::F32(is.as_str().parse().unwrap()),
+            FloatTy::F64 => Constant::F64(is.as_str().parse().unwrap()),
+        },
+        LitKind::Float(ref is, LitFloatType::Unsuffixed) => match ty.expect("type of float is known").kind {
             ty::Float(FloatTy::F32) => Constant::F32(is.as_str().parse().unwrap()),
             ty::Float(FloatTy::F64) => Constant::F64(is.as_str().parse().unwrap()),
             _ => bug!(),