From 1381d1adf6bcd0e277bed92c08e2bf2badf2a950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 25 Jul 2020 12:13:23 +0200 Subject: [PATCH 1/3] submodules: update rls from dd341d5 to a0e80a9 Changes: ```` deps: update racer and cargo ```` --- src/tools/rls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rls b/src/tools/rls index dd341d5307541..a0e80a9783b14 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit dd341d53075411cf0f71c5853c98facda35112ef +Subproject commit a0e80a9783b1485fe8935d5de4dec34fe6bb5f10 From 1859d7d66e7baf8351050fc061c5c2d22cb059d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 25 Jul 2020 12:13:37 +0200 Subject: [PATCH 2/3] submodules: update rustfmt from c1e9b7b8 to bcf09cbc Changes: ```` Add option space_before_fn_sig_paren (#4302) Don't bail out of formatting code blocks if lines are >100 chars Warn when rate limit is on docs page fixup! Ensure that doc url hash IDs are scrolled to on page load Ensure that doc url hash IDs are scrolled to on page load Consolidate util and utils (#4328) Bump rustc-ap-* crates to 669.0.0 (#4327) refactor: rename some private whitelist names (#4326) Configuration option to preserve blank lines at start of block (#4303) Recognize when a block comment has been ended inside a string literal (#4320) Add test for generic bounds on associated types Don't drop blocks on foreign functions Skip formatting generated files (#4296) Permit ranges on multiple lines in closures, without an enclosing block (#4309) Include const generic type bounds in their spans docs: Preserve updated query param content and add config option links Do not add trailing space to empty lines in comment code blocks (#4304) refactor: rename KeepExisting->Preserve variant for match arm pipes (#4305) Fix tests Use when emitting stdin as filename Add a test for #4028 Update test Do not touch module with #![rustfmt::skip] Do not normalize vertical spaces unless they are between items Update tests Do not duplicate const keyword on parameters Cargo update rustc-ap-* crates fix: don't make ABI explicit when not guaranteed to preserve semantics (#4293) Pick up comments between trait where clause and open block (#4292) Properly format function signature in extern blocks Add a test Update CHANGELOG.md (#4285) Do not reorder module declaration with #![macro_use] (#4284) Add upload-assets.yml (#4280) Put description in comment Address reviews Update .github/ISSUE_TEMPLATE/bug_report.md Update .github/ISSUE_TEMPLATE/bug_report.md Update issue templates Adds query param for version no (#4270) deps: bump rustc-ap* to v666 feat: require --force to format if there's errors (#4256) deps: apply rustc-ap 665 breaking changes deps: bump rustc-ap* to v665 Adds direct linking using header ids (#4272) Fix newlines in JSON output (#4262) fix: ensure idempotency on empty match blocks (#4271) Enable lazy_static during test Avoid using Symbol::intern docs: Fix a typo in README and Contributing (#4264) Regression test for #4254 docs: correct unstable opts descr. in readme docs: update build/test/install instructions deps: apply upstream rustc-* changes deps: bump rustc-ap* to v664.0.0 Prune stale issues (#4246) Triage issues (#4242) Pick up comments between visibility modifier and item name (#4239) Read the original file for comparing/detecting newline (#4236) Fix test (#4237) Regression test for #2323 (#4240) Update IntelliJ Integration (#4238) Remove version (#4235) Preserve Markdown line breaks in inner and outer block doc comments (#4233) Drop trailing semicolons on item statements (#4232) ci: get all jobs passing again (#4234) feat: conditionally allow unstable opts on stable/beta (#4228) Use rewrite buffer to determine if comment should be on a newline fixed => () to => {} (#4226) Do not emit file name on stdin mode (#4225) Add github-style highlighting for code blocks (#4224) Add documentation for additive configs from parent directories fixup! Show configs from different versions on github pages fixup! Show configs from different versions on github pages Show configs from different versions on github pages Handle const generic bounds in structs Fix stable toggle on gh pages configuration site Fix a typo Update the AppVeyor script Fix a typo Update CI Update Makefile.toml Add required-features Rename src/bin to src/rustfmt Remove workspace Include constness in impl blocks (#4215) Pick up comments before where clause in traits (#4213) fixup! Don't wrap comments that are part of a table Don't wrap comments that are part of a table Properly skip macros in impl and trait blocks (#4209) Use the span after generics and where clause (#4208) add recursive settings and clean up test whitelist (#4142) Pass a path to directory to GitignoreBuilder Add a test Do not format inner attributes twice in the main file Add Module Return inner attributes fix: handle recoverable submod parse errors correctly (#4200) Release v2.0.0-rc.2 Cargo update Fix makefile (#4203) #4099: trailing_comma + struct_field_align_threshold -> removing a struct's commas (#4201) Fix CFG_RELEASE value (#4202) Improve error message when module resolution failed (#4198) Upload annotate-snippets to 0.8 (#4161) Stabilize ignore config option (#4139) Merge configs from parent directories (#4179) Align string type for edition (#4197) Update Contributing.md (#4195) Fix module resolution in inner modules with paths (#4194) Parse comma-separated branches in macro definitions (#4173) Add cargo-make support (#4191) Do not break empty blocks in match arm patterns (#4187) Add test cases for fixed issues (#4189) Preserve comments in empty statements (#4180) Fix merge conflicts Cargo fmt Audit lib.rs Fix test Fix ignored test Fix test Fix git-rustfmt Add format_inputs Move some files Cargo fmt Move formatting-related modules under formatting Remove Session Rename Refactor Update rustc-ap crates to 659.0.0 (#4188) Stabilize match_block_trailing_comma. (#4145) Exclude where kw from comment following fn return type (#4175) Remove spaces added by comment opener when creating itemized block Remove legacy-rustfmt.toml (#4169) Properly align comments in unicode lines fixup! Preserve and format type aliases in extern blocks fixup! Preserve and format type aliases in extern blocks docs: add config info for match_arm_leading_pipes tests: add tests for leading pipe config feat: support configurability of leading pipe Create FUNDING.yml Exclude code block delimiters when wrapping comments (#4165) Compare code block line indentation with config whitespace (#4166) Rename fn_args_layout config option to fn_params_layout (#4163) fixup! Preserve and format type aliases in extern blocks Preserve and format type aliases in extern blocks Stabilize binop_separator. Remove disable_all_formatting (#4147) update to rustc 656 docs: clarify config opts availability [skip ci] (#4155) Update diff.rs (#4150) Use duncet to fix path issues (#4137) fixes #4115, #4029, #3898 tests ci: add max-parallel config to workflows chore: remove config/emitter cargo aliases Use absolute_path instead of fs::canonicalize (#4131) Remove coverage mode (#4015) Remove report_todo and report_fixme (#4129) Cargo update Bump config_proc_macro Use feature (#4127) Do not flatten match arm block with leading attributes (#4124) Use versionsort for everything that's auto-reordered by name (#3764) Update width heuristic configuration (#4063) Declare & implement `space_around_attr_eq` config. (#4040) tests: restore some config tests (#4064) fix: newline width calc in combine w/ comments (#4123) Bump rust-ap-* cratest to 654.0.0 (#4122) fix Issue 4020: problem reformatting block comments (#4071) bump rustc-ap-* crates to v651 (#4106) Issue 4079 (#4080) fix formatting arbitrary extern abi (#4088) Link tracking issues in Configurations.md (#4096) handles the case third parameter is None suppress internal error readme: update testing section (#4060) fix clippy warnings (#4061) fix not to break relative path link (#4042) Use the correct shape when formatting comment in empty struct (#4058) fix: handle long param attributes (#4047) support formatting half open ranges (#4044) fix: comment handling in control flows (#4055) Fix master (#4057) fix self_tests (#4033) feat: trait bounds const opt out (#4056) chore: fix compiler warning (#4051) feat: support raw ref operator (#4046) Fixed broken links (#4038) ignore 'rustfmt-core/rustfmt-bin/tests/**/target' (#4025) upgrade rustc-ap-* version to v642 (#4022) Run rustfmt Avoid poor-formatting of the rhs of lazy_static macro separate by a new line for `move ||` and `match` (#4007) Fix typo: error-on-unformatted (#4011) Update rustfmt command line interface (#4006) deps: switch back to main ignore crate (#4008) ci: update test commands meta: add cargo command aliases ci: specify job names ci: add linux/mac/integration tests on GHA Move rustfmt binariy crates to workspace (#4002) Do not remove comment from an import with a single item (#3999) fix how to test rustfmt (#4000) Separate rustfmt into multiple crates (#3998) fix internal error when stmt has doc attribute (#3985) use let to bind value from a macro expression (#3976) not to remove field literal for tuple (#3993) Use issue = "none" instead of "0" (#3977) Some minor cleanups (#3983) Use correct span for match arms with the leading pipe and attributes (#3975) Some minor cleanup (#3970) Update README.md ci: try windows build on GitHub Actions (#3969) fix not to overwrite on other platforms (#3971) Print out error message and file when detecting that rust parser panicked (#3972) Remove version gates (#3891) fix test (#3966) fix: (de)ser of FileLines between lib and cli opt (#3954) merge if condition for early return refactor: update json emitter to better handle errors (#3953) switch to non-recursive mode by default (#3938) add test return when span is start span fix span() for warn_directory_ownership case Switch to std::error::Error for errors (#3948) Do not add block around async closure (#3946) tests: fix try! test for 2018 edition update handling of parser errors (#3920) fix span of Try expression when converting from try! macro to the ? keyword (#3940) rewrite generic params no matter what kind it may be (#3941) feat: change default edition to 2018 (#3942) change last_pos when expr has attribute handle None case to remove whitespace before lhs (#3925) README grammar fix (#3926) Print entire comment line for report_todo/report_fixme (#3912) deprecate --backup option (#3902) Fix --check -l with stdin. (#3910) opts: rephrase wording for --all and -p (#3914) chore: drop derive-new dependency (#3917) add unnecessary directories and files to .gitignore (#3919) add trim to avoid internal error (#3905) merge commits from rustfmt-2.0 branch (#3907) Fix an `unused_paren` warning. (#3909) Make `--check` work when running from stdin. (#3896) tests: fix system tests on non-nightly tests: fix test for nested int test file discovery add support for formatting files in subdirectories of `tests` (#3777) deprecate skip_children option (#3895) support closure block indent_style (#3867) feat: add --check flag to cargo fmt (#3890) to use find_last_uncommented add find_last_uncommented Revert "[Should revert?] transfer logic" [Should revert?] transfer logic add tests fix to extract comments to stop internal error fix: checking block emptiness (#3878) Add --locked (#3889) Add syntux module (#3880) ```` --- src/tools/rustfmt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rustfmt b/src/tools/rustfmt index c1e9b7b87493c..bcf09cbcce52c 160000 --- a/src/tools/rustfmt +++ b/src/tools/rustfmt @@ -1 +1 @@ -Subproject commit c1e9b7b87493c5197c4330693bdf4ccb30a90971 +Subproject commit bcf09cbcce52c05da113353a2e924ca815349c10 From ff39438548136dcfd3aa72e8e77912a9d6f5dd90 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 25 Jul 2020 12:14:35 +0200 Subject: [PATCH 3/3] update Cargo.lock --- Cargo.lock | 168 +++++++++++++++++++++++++++++++++++------------------ 1 file changed, 113 insertions(+), 55 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6fb659178764..f7a85198d95a1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -53,6 +53,9 @@ name = "annotate-snippets" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d78ea013094e5ea606b1c05fe35f1dd7ea1eb1ea259908d040b25bd5ec677ee5" +dependencies = [ + "yansi-term", +] [[package]] name = "ansi_term" @@ -250,9 +253,6 @@ name = "bytecount" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0017894339f586ccb943b01b9555de56770c11cda818e7e3d8bd93f4ed7f46e" -dependencies = [ - "packed_simd", -] [[package]] name = "byteorder" @@ -903,6 +903,12 @@ dependencies = [ "rustc-std-workspace-core", ] +[[package]] +name = "dunce" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4" + [[package]] name = "either" version = "1.5.0" @@ -2043,15 +2049,6 @@ dependencies = [ "winapi 0.3.8", ] -[[package]] -name = "packed_simd" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25d36de864f7218ec5633572a800109bbe5a1cc8d9d95a967f3daf93ea7e6ddc" -dependencies = [ - "cfg-if", -] - [[package]] name = "panic_abort" version = "0.0.0" @@ -2415,9 +2412,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", @@ -2707,7 +2704,7 @@ dependencies = [ "rls-vfs", "rustc-workspace-hack", "rustc_tools_util 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustfmt-nightly", + "rustfmt-nightly 1.4.19", "serde", "serde_derive", "serde_ignored", @@ -2811,9 +2808,9 @@ 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", @@ -2821,9 +2818,9 @@ dependencies = [ [[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", @@ -2839,9 +2836,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", @@ -2858,9 +2855,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", @@ -2870,9 +2867,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", @@ -2888,9 +2885,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", @@ -2918,9 +2915,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", @@ -2936,9 +2933,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", @@ -2958,9 +2955,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", @@ -2969,21 +2966,21 @@ 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", @@ -2991,18 +2988,18 @@ dependencies = [ [[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", @@ -3012,9 +3009,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", @@ -3031,9 +3028,9 @@ 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", @@ -3041,10 +3038,11 @@ dependencies = [ [[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", @@ -3060,9 +3058,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", @@ -3079,9 +3077,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", @@ -4076,6 +4074,17 @@ dependencies = [ [[package]] name = "rustfmt-config_proc_macro" version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b19836fdb238d3f321427a41b87e6c2e9ac132f209d1dc55c55fae8d1df3996f" +dependencies = [ + "proc-macro2 1.0.3", + "quote 1.0.2", + "syn 1.0.11", +] + +[[package]] +name = "rustfmt-config_proc_macro" +version = "0.5.1" dependencies = [ "proc-macro2 1.0.3", "quote 1.0.2", @@ -4085,7 +4094,9 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.4.18" +version = "1.4.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7ba9520127a57465d29920e1d17939aea800839982ea784e2888f79de53ec8f" dependencies = [ "annotate-snippets 0.6.1", "anyhow", @@ -4111,7 +4122,45 @@ dependencies = [ "rustc-ap-rustc_session", "rustc-ap-rustc_span", "rustc-workspace-hack", - "rustfmt-config_proc_macro", + "rustfmt-config_proc_macro 0.2.0", + "serde", + "serde_json", + "structopt", + "term 0.6.0", + "thiserror", + "toml", + "unicode-segmentation", + "unicode-width", + "unicode_categories", +] + +[[package]] +name = "rustfmt-nightly" +version = "2.0.0-rc.2" +dependencies = [ + "annotate-snippets 0.8.0", + "anyhow", + "bytecount", + "cargo_metadata 0.9.1", + "diff", + "dirs", + "dunce", + "env_logger 0.7.1", + "ignore", + "itertools 0.8.0", + "lazy_static", + "log", + "regex", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_ast_pretty", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_expand", + "rustc-ap-rustc_parse", + "rustc-ap-rustc_session", + "rustc-ap-rustc_span", + "rustc-workspace-hack", + "rustfmt-config_proc_macro 0.5.1", "serde", "serde_json", "structopt", @@ -5254,3 +5303,12 @@ checksum = "65923dd1784f44da1d2c3dbbc5e822045628c590ba72123e1c73d3c230c4434d" dependencies = [ "linked-hash-map", ] + +[[package]] +name = "yansi-term" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1" +dependencies = [ + "winapi 0.3.8", +]