Skip to content

Commit a2128bd

Browse files
authored
Rollup merge of rust-lang#62432 - topecongiro:rustfmt-1.3.2, r=Centril
Update rustfmt to 1.3.2 This PR is a successor of rust-lang#62244. r? @Centril
2 parents 691dc8a + 5eb662f commit a2128bd

File tree

2 files changed

+17
-31
lines changed

2 files changed

+17
-31
lines changed

Cargo.lock

+16-30
Original file line numberDiff line numberDiff line change
@@ -336,18 +336,6 @@ dependencies = [
336336
"syn 0.15.35 (registry+https://github.com/rust-lang/crates.io-index)",
337337
]
338338

339-
[[package]]
340-
name = "cargo_metadata"
341-
version = "0.7.1"
342-
source = "registry+https://github.com/rust-lang/crates.io-index"
343-
dependencies = [
344-
"error-chain 0.12.0 (registry+https://github.com/rust-lang/crates.io-index)",
345-
"semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
346-
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
347-
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
348-
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
349-
]
350-
351339
[[package]]
352340
name = "cargo_metadata"
353341
version = "0.8.0"
@@ -811,12 +799,11 @@ dependencies = [
811799

812800
[[package]]
813801
name = "dirs"
814-
version = "1.0.5"
802+
version = "2.0.1"
815803
source = "registry+https://github.com/rust-lang/crates.io-index"
816804
dependencies = [
817-
"libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)",
818-
"redox_users 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
819-
"winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
805+
"cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
806+
"dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
820807
]
821808

822809
[[package]]
@@ -2606,7 +2593,7 @@ dependencies = [
26062593
"rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)",
26072594
"rustc-workspace-hack 1.0.0",
26082595
"rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
2609-
"rustfmt-nightly 1.3.0",
2596+
"rustfmt-nightly 1.3.2",
26102597
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
26112598
"serde_derive 1.0.81 (registry+https://github.com/rust-lang/crates.io-index)",
26122599
"serde_ignored 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3434,7 +3421,7 @@ dependencies = [
34343421

34353422
[[package]]
34363423
name = "rustfmt-config_proc_macro"
3437-
version = "0.1.0"
3424+
version = "0.1.2"
34383425
dependencies = [
34393426
"proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
34403427
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3444,15 +3431,15 @@ dependencies = [
34443431

34453432
[[package]]
34463433
name = "rustfmt-nightly"
3447-
version = "1.3.0"
3434+
version = "1.3.2"
34483435
dependencies = [
34493436
"annotate-snippets 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
34503437
"atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
34513438
"bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
3452-
"cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
3439+
"cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
34533440
"derive-new 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
34543441
"diff 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
3455-
"dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
3442+
"dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
34563443
"env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
34573444
"failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
34583445
"getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3465,10 +3452,10 @@ dependencies = [
34653452
"rustc-ap-syntax 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
34663453
"rustc-ap-syntax_pos 491.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
34673454
"rustc-workspace-hack 1.0.0",
3468-
"rustfmt-config_proc_macro 0.1.0",
3455+
"rustfmt-config_proc_macro 0.1.2",
34693456
"serde 1.0.92 (registry+https://github.com/rust-lang/crates.io-index)",
34703457
"serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
3471-
"structopt 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
3458+
"structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
34723459
"term 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
34733460
"toml 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
34743461
"unicode-segmentation 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3749,16 +3736,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
37493736

37503737
[[package]]
37513738
name = "structopt"
3752-
version = "0.2.16"
3739+
version = "0.2.18"
37533740
source = "registry+https://github.com/rust-lang/crates.io-index"
37543741
dependencies = [
37553742
"clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
3756-
"structopt-derive 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
3743+
"structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
37573744
]
37583745

37593746
[[package]]
37603747
name = "structopt-derive"
3761-
version = "0.2.16"
3748+
version = "0.2.18"
37623749
source = "registry+https://github.com/rust-lang/crates.io-index"
37633750
dependencies = [
37643751
"heck 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4544,7 +4531,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
45444531
"checksum byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "94f88df23a25417badc922ab0f5716cc1330e87f71ddd9203b3a3ccd9cedf75d"
45454532
"checksum bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "40ade3d27603c2cb345eb0912aec461a6dec7e06a4ae48589904e808335c7afa"
45464533
"checksum bytesize 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "716960a18f978640f25101b5cbf1c6f6b0d3192fab36a2d98ca96f0ecbe41010"
4547-
"checksum cargo_metadata 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "585784cac9b05c93a53b17a0b24a5cdd1dfdda5256f030e089b549d2390cc720"
45484534
"checksum cargo_metadata 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "929766d993a2fde7a0ae962ee82429069cd7b68839cd9375b98efd719df65d3a"
45494535
"checksum cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "5e5f3fee5eeb60324c2781f1e41286bdee933850fff9b3c672587fed5ec58c83"
45504536
"checksum cfg-if 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "89431bba4e6b7092fb5fcd00a6f6ca596c55cc26b2f1e6dcdd08a1f4933f66b2"
@@ -4585,7 +4571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
45854571
"checksum difference 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "524cbf6897b527295dff137cec09ecf3a05f4fddffd7dfcd1585403449e74198"
45864572
"checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
45874573
"checksum directories 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ccc83e029c3cebb4c8155c644d34e3a070ccdb4ff90d369c74cd73f7cb3c984"
4588-
"checksum dirs 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "3fd78930633bd1c6e35c4b42b1df7b0cbc6bc191146e512bb3bedf243fcc3901"
4574+
"checksum dirs 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4ef5a8b902d393339e2a2c7fe573af92ce7e0ee5a3ff827b4c9ad7e07e4fa1"
45894575
"checksum dirs-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "937756392ec77d1f2dd9dc3ac9d69867d109a2121479d72c364e42f4cab21e2d"
45904576
"checksum dlmalloc 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "f283302e035e61c23f2b86b3093e8c6273a4c3125742d6087e96ade001ca5e63"
45914577
"checksum dtoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "ea57b42383d091c85abcc2706240b94ab2a8fa1fc81c10ff23c4de06e2a90b5e"
@@ -4816,8 +4802,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
48164802
"checksum string_cache_shared 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1884d1bc09741d466d9b14e6d37ac89d6909cbcac41dd9ae982d4d063bbedfc"
48174803
"checksum strip-ansi-escapes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9d63676e2abafa709460982ddc02a3bb586b6d15a49b75c212e06edd3933acee"
48184804
"checksum strsim 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb4f380125926a99e52bc279241539c018323fab05ad6368b56f93d9369ff550"
4819-
"checksum structopt 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "fa19a5a708e22bb5be31c1b6108a2a902f909c4b9ba85cba44c06632386bc0ff"
4820-
"checksum structopt-derive 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)" = "c6d59d0ae8ef8de16e49e3ca7afa16024a3e0dfd974a75ef93fdc5464e34523f"
4805+
"checksum structopt 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "16c2cdbf9cc375f15d1b4141bc48aeef444806655cd0e904207edc8d68d86ed7"
4806+
"checksum structopt-derive 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "53010261a84b37689f9ed7d395165029f9cc7abb9f56bbfe86bee2597ed25107"
48214807
"checksum strum 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f6c3a2071519ab6a48f465808c4c1ffdd00dfc8e93111d02b4fc5abab177676e"
48224808
"checksum strum_macros 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8baacebd7b7c9b864d83a6ba7a246232983e277b86fa5cdec77f565715a4b136"
48234809
"checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"

src/tools/rustfmt

0 commit comments

Comments
 (0)