Rollup merge of #50889 - oli-obk:clippy, r=kennytm

Update clippy

# Conflicts:
#	src/Cargo.lock

diff --combined src/Cargo.lock
index 64f550be5148b3761b3b1ec4b785251048064355,6472b450f51958d50e2c7369455d8b685b9ffc60..8c2d8fc989b895c5a357904ed4bfe1faad22d0cb
--- 1/src/Cargo.lock
--- 2/src/Cargo.lock
+++ b/src/Cargo.lock
@@@ -288,12 -288,12 +288,12 @@@ dependencies = 
  
  [[package]]
  name = "clippy"
- version = "0.0.200"
+ version = "0.0.202"
  dependencies = [
   "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
   "clippy-mini-macro-test 0.2.0",
-  "clippy_lints 0.0.200",
+  "clippy_lints 0.0.202",
   "compiletest_rs 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
   "derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
   "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -311,6 -311,27 +311,27 @@@ version = "0.2.0
  [[package]]
  name = "clippy_lints"
  version = "0.0.200"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ dependencies = [
+  "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "pulldown-cmark 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
+  "regex-syntax 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde_derive 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)",
+  "toml 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+  "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+  "url 1.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ ]
+ 
+ [[package]]
+ name = "clippy_lints"
+ version = "0.0.202"
  dependencies = [
   "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
   "if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -588,7 -609,7 +609,7 @@@ dependencies = 
  
  [[package]]
  name = "ena"
 -version = "0.9.2"
 +version = "0.9.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1624,7 -1645,7 +1645,7 @@@ version = "0.128.0
  dependencies = [
   "cargo 0.29.0",
   "cargo_metadata 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
-  "clippy_lints 0.0.200",
+  "clippy_lints 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)",
   "env_logger 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
   "failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1750,7 -1771,7 +1771,7 @@@ version = "128.0.0
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
   "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 - "ena 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -1957,7 -1978,7 +1978,7 @@@ name = "rustc_data_structures
  version = "0.0.0"
  dependencies = [
   "cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 - "ena 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
 + "ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
   "log 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
   "parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
   "parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -2978,6 -2999,7 +2999,7 @@@ source = "registry+https://github.com/r
  "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de"
  "checksum chrono 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ba5f60682a4c264e7f8d77b82e7788938a76befdf949d4a98026d19099c9d873"
  "checksum clap 2.31.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0f16b89cbb9ee36d87483dc939fe9f1e13c05898d56d7b230a0d4dff033a536"
+ "checksum clippy_lints 0.0.200 (registry+https://github.com/rust-lang/crates.io-index)" = "d2432663f6bdb90255dcf9df5ca504f99b575bb471281591138f62f9d31f863b"
  "checksum cmake 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)" = "5cf678ceebedde428000cb3a34465cf3606d1a48da17014948a916deac39da7c"
  "checksum colored 1.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b0aa3473e85a3161b59845d6096b289bb577874cafeaf75ea1b1beaa6572c7fc"
  "checksum commoncrypto 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d056a8586ba25a1e4d61cb090900e495952c7886786fc55f909ab2f819b69007"
@@@ -2999,7 -3021,7 +3021,7 @@@
  "checksum dtoa 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "09c3753c3db574d215cba4ea76018483895d7bff25a31b49ba45db21c48e50ab"
  "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
  "checksum elasticlunr-rs 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4511b63d69dd5d31e8e29aed2c132c413f87acea8035d0584801feaab9dd1f0f"
 -"checksum ena 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f8b449f3b18c89d2dbe40548d2ee4fa58ea0a08b761992da6ecb9788e4688834"
 +"checksum ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621"
  "checksum endian-type 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
  "checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
  "checksum env_logger 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)" = "be27f8ea102a7182093a80d98f0b78623b580eda8791cbe8e2345fe6e57567a6"