Skip to content

Commit

Permalink
Auto merge of #74760 - tmandry:roll, r=tmandry
Browse files Browse the repository at this point in the history 
Update rustfmt and rls

Closes #74080, #74081.

rls changes:
- deps: update racer and cargo

rustfmt changes:
- preparation for potential rustfmt 1.4.19 (#4283)
- chore: backport 8157a3f0afe978d3e953420577f8344db7e905bf
- deps: bump rustc-ap to v669
- deps: bump rustc-ap-* to v668
- deps: bump rustc-ap* to v666
- Use correct span for match arms with the leading pipe and attributes (#3975)
  • Loading branch information
@bors
bors committed Jul 25, 2020
2 parents 8cb94fc + e193cb1 commit d6953df
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 43 deletions.
83 changes: 42 additions & 41 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2415,9 +2415,9 @@ dependencies = [

[[package]]
name = "racer"
version = "2.1.35"
version = "2.1.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "421174f19211ba9e5fda34aa0cbc292188aae8e0cfbff4aebbae23f1a416bfb3"
checksum = "09ba6cca9fcd8ae086b842b1bd9e3f19f104a4c30e0e8927b2befc06d375e7e0"
dependencies = [
"bitflags",
"clap",
Expand Down Expand Up @@ -2811,19 +2811,19 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_arena"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c6683b49209f8b132bec33dc6b6c8f9958c8c94eb3586d4cb495e092b61c1da"
checksum = "c9cdd301e9dcb15ead384fc07196c850fd22829fae81d296b2ed6b4b10bf3278"
dependencies = [
"rustc-ap-rustc_data_structures",
"smallvec 1.4.0",
]

[[package]]
name = "rustc-ap-rustc_ast"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b21784d92fb2d584800f528866f00fe814f73abda794f406bfd1fbb2f1ca7f7"
checksum = "3f7c0d0537ca69dfe4a49212035295dfb37a235b5df01aa877d50b247f4775b8"
dependencies = [
"bitflags",
"log",
Expand All @@ -2839,9 +2839,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_ast_passes"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "820c46fde7ef1df0432073090d775f097b7279ca75ea34ba954081ce4b884d4c"
checksum = "d4cf4dca95f55f70eeb193fb08554026d79d0628de771fd726bb609e36887b82"
dependencies = [
"itertools 0.8.0",
"log",
Expand All @@ -2858,9 +2858,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_ast_pretty"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "013db7dd198fe95962d2cefa5bd0b350cf2028af77c169b17b4baa9c3bbf77d1"
checksum = "202bd2886d0cfa48baa3711042c14843f1b4852555b7ee7e5376bf66b276cb8d"
dependencies = [
"log",
"rustc-ap-rustc_ast",
Expand All @@ -2870,9 +2870,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_attr"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "35b5a85c90eb341eec543600ffdd9e262da5ea72a73a23ae4ca2f4ab8cd1a188"
checksum = "b11ee1d92b3214e8a8c7829eff84cc1b03925da0ea5c6900cefe05b99edb4682"
dependencies = [
"rustc-ap-rustc_ast",
"rustc-ap-rustc_ast_pretty",
Expand All @@ -2888,9 +2888,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_data_structures"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b92e4c6cb6c43ee9031a71709dc12853b358253c2b41d12a26379994fab625e0"
checksum = "7a45d43b974d4cb9e32e5a15119c5eb7672c306ef09b064f2125b6a0399f6656"
dependencies = [
"bitflags",
"cfg-if",
Expand Down Expand Up @@ -2918,9 +2918,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_errors"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6b0aa79423260c1b9e2f856e144e040f606b0f5d43644408375becf9d7bcdf86"
checksum = "8cd895d440820aaa04e6dc5486105494920a1e9779b9b051e8dba4ca5c182f94"
dependencies = [
"annotate-snippets 0.8.0",
"atty",
Expand All @@ -2936,9 +2936,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_expand"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c07d76ba2a1b7d4325a2ed21d6345ccebd89ddc6666a1535a6edd489fb4cbc11"
checksum = "71a0cc7820860d6691bf0aa7a95cdbc60f6587b495c18e0fa15a888fdabbf171"
dependencies = [
"log",
"rustc-ap-rustc_ast",
Expand All @@ -2958,9 +2958,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_feature"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1bbd625705c1db42a0c7503736292813d7b76ada5da20578fb55c63228c80ab5"
checksum = "5473d5106401aa46f881eb91772f0a41fd5f28ae6134cf4b450eb1370ea6af22"
dependencies = [
"lazy_static",
"rustc-ap-rustc_data_structures",
Expand All @@ -2969,40 +2969,40 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_fs_util"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34cca6e2942fa0b059c582437ead666d5bcf20fa7c242599e2bbea9b609f29ae"
checksum = "8da1d57ee7a7ef55f31a97d99c7f919f02fc9a60ab96faa8cf45a7ae3ab1ccbf"

[[package]]
name = "rustc-ap-rustc_graphviz"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13d6a029b81f5e02da85763f82c135507f278a4a0c776432c728520563059529"
checksum = "e3af62b20460908378cd1d354917acd9553376c5363bbb4e465f949bd82bdef9"

[[package]]
name = "rustc-ap-rustc_index"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bae50852d303e230b2781c994513788136dc6c2fe4ebe032959f0b990a425767"
checksum = "3af7d4c456fe7647453d3fcd58335c9d512d1ff9a239a370b7ebdd353d69f66f"
dependencies = [
"rustc-ap-rustc_serialize",
"smallvec 1.4.0",
]

[[package]]
name = "rustc-ap-rustc_lexer"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7186e74aa2d31bf0e2454325fefcdf0a3da77d9344134592144b9e40d45b15d"
checksum = "456af5f09c006cf6c22c1a433ee0232c4bb74bdc6c647a010166a47c94ed2a63"
dependencies = [
"unicode-xid 0.2.0",
]

[[package]]
name = "rustc-ap-rustc_macros"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fc1add04e9d2301164118660ee0bc3266e9a7b1973fc2303fdbe002a12e5401"
checksum = "64f6acd192f313047759a346b892998b626466b93fe04f415da5f38906bb3b4c"
dependencies = [
"proc-macro2 1.0.3",
"quote 1.0.2",
Expand All @@ -3012,9 +3012,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_parse"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9cd7fc4968bd60084f2fa4f280fa450b0cf98660a7983d6b93a7ae41b6d1d322"
checksum = "c006e8117c1c55e42bb56386c86ce6f7e4b47349e0bec7888c1d24784272e61b"
dependencies = [
"bitflags",
"log",
Expand All @@ -3031,20 +3031,21 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_serialize"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00bf4c110271d9a2b7dfd2c6eb82e56fd80606a8bad6c102e158c54e44044046"
checksum = "306ced69beaeebe4de9552ee751eb54ea25b5f34a73fe80f5f9cbbe15ccebc48"
dependencies = [
"indexmap",
"smallvec 1.4.0",
]

[[package]]
name = "rustc-ap-rustc_session"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "431cf962de71d4c03fb877d54f331ec36eca77350b0539017abc40a4410d6501"
checksum = "dbff48435f5a476365e3ab5f49e07f98715cecb2d8c5bbcafeaf3aec638407be"
dependencies = [
"bitflags",
"getopts",
"log",
"num_cpus",
Expand All @@ -3060,9 +3061,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_span"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b912039640597624f4bcb75f1e1fcfa5710267d715a7f73a6336baef341b23d1"
checksum = "ec4273af0abbe78fc4585316ab193445c848c555e9203ddc28af02330918bf30"
dependencies = [
"cfg-if",
"log",
Expand All @@ -3079,9 +3080,9 @@ dependencies = [

[[package]]
name = "rustc-ap-rustc_target"
version = "664.0.0"
version = "669.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51347a9dadc5ad0b5916cc12d42624b31955285ad13745dbe72f0140038b84e9"
checksum = "6f9a2d6004ce6ad492a8eeacc2569b1c008169434b8828996d8dade4e5c6b6ee"
dependencies = [
"bitflags",
"log",
Expand Down Expand Up @@ -4085,7 +4086,7 @@ dependencies = [

[[package]]
name = "rustfmt-nightly"
version = "1.4.18"
version = "1.4.19"
dependencies = [
"annotate-snippets 0.6.1",
"anyhow",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/rls
Submodule rls updated 2 files
+46 −45 Cargo.lock
+3 −3 Cargo.toml
2 changes: 1 addition & 1 deletion src/tools/rustfmt
Submodule rustfmt updated 13 files
+130 −132 Cargo.lock
+10 −10 Cargo.toml
+2 −2 src/chains.rs
+3 −0 src/config/mod.rs
+1 −1 src/formatting.rs
+6 −13 src/items.rs
+1 −0 src/matches.rs
+1 −1 src/types.rs
+4 −4 src/visitor.rs
+0 −1 tests/config/issue-3779.toml
+1 −0 tests/source/issue-3779/lib.rs
+1 −0 tests/target/issue-3779/lib.rs
+10 −0 tests/target/issue-3974.rs

0 comments on commit d6953df

Please sign in to comment.