Skip to content

Commit 7e32059

Browse files
borsbors
committed
Auto merge of #52388 - oli-obk:clippy, r=Manishearth
Update clippy and rls r? @Manishearth cc @kennytm @nrc
2 parents 49f1e5d + 0ad5453 commit 7e32059

File tree

6 files changed

+24
-30
lines changed

6 files changed

+24
-30
lines changed

‎src/Cargo.lock‎

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -301,13 +301,13 @@ dependencies = [
301301

302302
[[package]]
303303
name = "clippy"
304-
version = "0.0.211"
304+
version = "0.0.212"
305305
dependencies = [
306306
"ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
307307
"backtrace 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
308308
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
309309
"clippy-mini-macro-test 0.2.0",
310-
"clippy_lints 0.0.211",
310+
"clippy_lints 0.0.212",
311311
"compiletest_rs 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)",
312312
"derive-new 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)",
313313
"lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -326,7 +326,7 @@ version = "0.2.0"
326326

327327
[[package]]
328328
name = "clippy_lints"
329-
version = "0.0.211"
329+
version = "0.0.212"
330330
dependencies = [
331331
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
332332
"if_chain 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -604,14 +604,6 @@ dependencies = [
604604
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
605605
]
606606

607-
[[package]]
608-
name = "enum_primitive"
609-
version = "0.1.1"
610-
source = "registry+https://github.com/rust-lang/crates.io-index"
611-
dependencies = [
612-
"num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)",
613-
]
614-
615607
[[package]]
616608
name = "env_logger"
617609
version = "0.5.10"
@@ -994,11 +986,12 @@ dependencies = [
994986

995987
[[package]]
996988
name = "languageserver-types"
997-
version = "0.43.0"
989+
version = "0.45.0"
998990
source = "registry+https://github.com/rust-lang/crates.io-index"
999991
dependencies = [
1000992
"bitflags 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
1001-
"enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
993+
"num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
994+
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
1002995
"serde 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)",
1003996
"serde_derive 1.0.69 (registry+https://github.com/rust-lang/crates.io-index)",
1004997
"serde_json 1.0.22 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1249,16 +1242,19 @@ version = "0.1.12"
12491242
source = "registry+https://github.com/rust-lang/crates.io-index"
12501243

12511244
[[package]]
1252-
name = "num-integer"
1253-
version = "0.1.39"
1245+
name = "num-derive"
1246+
version = "0.2.2"
12541247
source = "registry+https://github.com/rust-lang/crates.io-index"
12551248
dependencies = [
12561249
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
1250+
"proc-macro2 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
1251+
"quote 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
1252+
"syn 0.14.4 (registry+https://github.com/rust-lang/crates.io-index)",
12571253
]
12581254

12591255
[[package]]
1260-
name = "num-traits"
1261-
version = "0.1.43"
1256+
name = "num-integer"
1257+
version = "0.1.39"
12621258
source = "registry+https://github.com/rust-lang/crates.io-index"
12631259
dependencies = [
12641260
"num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1665,13 +1661,13 @@ version = "0.129.0"
16651661
dependencies = [
16661662
"cargo 0.30.0",
16671663
"cargo_metadata 0.5.8 (registry+https://github.com/rust-lang/crates.io-index)",
1668-
"clippy_lints 0.0.211",
1664+
"clippy_lints 0.0.212",
16691665
"env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
16701666
"failure 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
16711667
"itertools 0.7.8 (registry+https://github.com/rust-lang/crates.io-index)",
16721668
"json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)",
16731669
"jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
1674-
"languageserver-types 0.43.0 (registry+https://github.com/rust-lang/crates.io-index)",
1670+
"languageserver-types 0.45.0 (registry+https://github.com/rust-lang/crates.io-index)",
16751671
"lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
16761672
"log 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
16771673
"num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3063,7 +3059,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
30633059
"checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
30643060
"checksum elasticlunr-rs 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4837d77a1e157489a3933b743fd774ae75074e0e390b2b7f071530048a0d87ee"
30653061
"checksum ena 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "88dc8393b3c7352f94092497f6b52019643e493b6b890eb417cdb7c46117e621"
3066-
"checksum enum_primitive 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "be4551092f4d519593039259a9ed8daedf0da12e5109c5280338073eaeb81180"
30673062
"checksum env_logger 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0e6e40ebb0e66918a37b38c7acab4e10d299e0463fe2af5d29b9cc86710cfd2a"
30683063
"checksum environment 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1f4b14e20978669064c33b4c1e0fb4083412e40fe56cbea2eae80fd7591503ee"
30693064
"checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3"
@@ -3102,7 +3097,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31023097
"checksum json 0.11.13 (registry+https://github.com/rust-lang/crates.io-index)" = "9ad0485404155f45cce53a40d4b2d6ac356418300daed05273d9e26f91c390be"
31033098
"checksum jsonrpc-core 8.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ddf83704f4e79979a424d1082dd2c1e52683058056c9280efa19ac5f6bc9033c"
31043099
"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
3105-
"checksum languageserver-types 0.43.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dedb2c8010c9c7530b205fd16ed24a158c3a46634cb0fc61528b17cbbb55df1a"
3100+
"checksum languageserver-types 0.45.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d91d91d1c23db74187096d191967cb49f49bb175ad6d855fa9229d16ef2c982"
31063101
"checksum lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "76f033c7ad61445c5b347c7382dd1237847eb1bce590fe50365dcb33d546be73"
31073102
"checksum lazy_static 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e6412c5e2ad9584b0b8e979393122026cdd6d2a80b933f890dcd694ddbe73739"
31083103
"checksum lazycell 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a6f08839bc70ef4a3fe1d566d5350f519c5912ea86be0df1740a7d247c7fc0ef"
@@ -3127,8 +3122,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
31273122
"checksum miow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9224c91f82b3c47cf53dcf78dfaa20d6888fbcc5d272d5f2fcdf8a697f3c987d"
31283123
"checksum new_debug_unreachable 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0cdc457076c78ab54d5e0d6fa7c47981757f1e34dc39ff92787f217dede586c4"
31293124
"checksum nodrop 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "9a2228dca57108069a5262f2ed8bd2e82496d2e074a06d1ccc7ce1687b6ae0a2"
3125+
"checksum num-derive 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0d2c31b75c36a993d30c7a13d70513cb93f02acafdd5b7ba250f9b0e18615de7"
31303126
"checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
3131-
"checksum num-traits 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "92e5113e9fd4cc14ded8e499429f396a20f98c772a47cc8622a736e1ec843c31"
31323127
"checksum num-traits 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "630de1ef5cc79d0cdd78b7e33b81f083cbfe90de0f4b2b2f07f905867c70e9fe"
31333128
"checksum num_cpus 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c51a3322e4bca9d212ad9a158a02abc6934d005490c054a2778df73a70aa0a30"
31343129
"checksum open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c281318d992e4432cfa799969467003d05921582a7489a8325e37f8a450d5113"

‎src/Cargo.toml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,4 @@ cargo = { path = "tools/cargo" }
7171
rustfmt-nightly = { path = "tools/rustfmt" }
7272

7373
[patch."https://github.com/rust-lang-nursery/rust-clippy"]
74-
clippy = { path = "tools/clippy" }
7574
clippy_lints = { path = "tools/clippy/clippy_lints" }

‎src/librustc/hir/mod.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,7 @@ impl Mutability {
940940
}
941941
}
942942

943-
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, Copy)]
943+
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, Copy, Hash)]
944944
pub enum BinOp_ {
945945
/// The `+` operator (addition)
946946
BiAdd,
@@ -1069,7 +1069,7 @@ impl Into<ast::BinOpKind> for BinOp_ {
10691069

10701070
pub type BinOp = Spanned<BinOp_>;
10711071

1072-
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, Copy)]
1072+
#[derive(Clone, PartialEq, RustcEncodable, RustcDecodable, Debug, Copy, Hash)]
10731073
pub enum UnOp {
10741074
/// The `*` operator for dereferencing
10751075
UnDeref,

‎src/libsyntax/ast.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ impl MacroDef {
12481248
}
12491249
}
12501250

1251-
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy)]
1251+
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy, Hash, PartialEq)]
12521252
pub enum StrStyle {
12531253
/// A regular string, like `"foo"`
12541254
Cooked,
@@ -1261,7 +1261,7 @@ pub enum StrStyle {
12611261
/// A literal
12621262
pub type Lit = Spanned<LitKind>;
12631263

1264-
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy)]
1264+
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Copy, Hash, PartialEq)]
12651265
pub enum LitIntType {
12661266
Signed(IntTy),
12671267
Unsigned(UintTy),
@@ -1271,7 +1271,7 @@ pub enum LitIntType {
12711271
/// Literal kind.
12721272
///
12731273
/// E.g. `"foo"`, `42`, `12.34` or `bool`
1274-
#[derive(Clone, RustcEncodable, RustcDecodable, Debug)]
1274+
#[derive(Clone, RustcEncodable, RustcDecodable, Debug, Hash, PartialEq)]
12751275
pub enum LitKind {
12761276
/// A string literal (`"foo"`)
12771277
Str(Symbol, StrStyle),

‎src/tools/clippy‎

‎src/tools/rls‎

Submodule rls updated from 6b4238b to 2b57851

0 commit comments

Comments
 (0)