From f2bb7a7513878ca698d97c077c4a4459438a4583 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 14 Mar 2021 13:10:19 -0500 Subject: [PATCH 01/15] deps: bump rustc-ap crates to v708 --- Cargo.lock | 444 +++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 16 +- 2 files changed, 352 insertions(+), 108 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6e65d5626a2..0bf7db5aa59 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "aho-corasick" version = "0.7.6" @@ -885,6 +887,15 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rustc-ap-rustc_arena" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c0f30a24b4e286e7f691e444484b985f93bb4724e1c8f656ebb3f3a725472c6" +dependencies = [ + "smallvec", +] + [[package]] name = "rustc-ap-rustc_ast" version = "706.0.0" @@ -892,32 +903,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5579379dd7e34bb522cbab946df43921f3d6fa587fc9101358db0a26b177b24" dependencies = [ "bitflags", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_index", - "rustc-ap-rustc_lexer", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_span", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_index 706.0.0", + "rustc-ap-rustc_lexer 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-ap-rustc_span 706.0.0", + "smallvec", + "tracing", +] + +[[package]] +name = "rustc-ap-rustc_ast" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5415b0026ca0198717b04d9a579c941ca34089bc921d3f02cff1b6cf63fa95c9" +dependencies = [ + "bitflags", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_index 708.0.0", + "rustc-ap-rustc_lexer 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_span 708.0.0", "smallvec", "tracing", ] [[package]] name = "rustc-ap-rustc_ast_passes" -version = "706.0.0" +version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad87c7440fb916a699cc21a2d0957485a1174cc07a8eb5a7c7ecec9416d4cae3" +checksum = "1737c6420474739cb89f557ed8d1231f0b6068620fb3c0fd0a09f0dd79aebbb9" dependencies = [ "itertools 0.9.0", - "rustc-ap-rustc_ast", - "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_attr", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_errors", - "rustc-ap-rustc_feature", + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_ast_pretty 708.0.0", + "rustc-ap-rustc_attr 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_errors 708.0.0", + "rustc-ap-rustc_feature 708.0.0", "rustc-ap-rustc_parse", - "rustc-ap-rustc_session", - "rustc-ap-rustc_span", + "rustc-ap-rustc_session 708.0.0", + "rustc-ap-rustc_span 708.0.0", "tracing", ] @@ -927,8 +955,19 @@ version = "706.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11fe1dbcfbb58ea768a9a05a9df27093b4a8fe03b715d3d96df84ae1093b3859" dependencies = [ - "rustc-ap-rustc_ast", - "rustc-ap-rustc_span", + "rustc-ap-rustc_ast 706.0.0", + "rustc-ap-rustc_span 706.0.0", + "tracing", +] + +[[package]] +name = "rustc-ap-rustc_ast_pretty" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e86b6a279fd02e57590834a489eb4a4fe31d03c176f755072505977a4d5f202" +dependencies = [ + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_span 708.0.0", "tracing", ] @@ -938,16 +977,34 @@ version = "706.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9429e42aaf0b12e133b93411bb8205388fba4fe3dd819199ae52672ad21b81a0" dependencies = [ - "rustc-ap-rustc_ast", - "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_errors", - "rustc-ap-rustc_feature", - "rustc-ap-rustc_lexer", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_session", - "rustc-ap-rustc_span", + "rustc-ap-rustc_ast 706.0.0", + "rustc-ap-rustc_ast_pretty 706.0.0", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_errors 706.0.0", + "rustc-ap-rustc_feature 706.0.0", + "rustc-ap-rustc_lexer 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-ap-rustc_session 706.0.0", + "rustc-ap-rustc_span 706.0.0", +] + +[[package]] +name = "rustc-ap-rustc_attr" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31de4bc77d5fc437a50451ac12d3e2459f6794d8e7f50bd6c0f48ec6744b96f" +dependencies = [ + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_ast_pretty 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_errors 708.0.0", + "rustc-ap-rustc_feature 708.0.0", + "rustc-ap-rustc_lexer 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_session 708.0.0", + "rustc-ap-rustc_span 708.0.0", ] [[package]] @@ -966,10 +1023,41 @@ dependencies = [ "libc", "measureme", "parking_lot", - "rustc-ap-rustc_graphviz", - "rustc-ap-rustc_index", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", + "rustc-ap-rustc_graphviz 706.0.0", + "rustc-ap-rustc_index 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-hash", + "rustc-rayon", + "rustc-rayon-core", + "smallvec", + "stable_deref_trait", + "stacker", + "tempfile", + "tracing", + "winapi", +] + +[[package]] +name = "rustc-ap-rustc_data_structures" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49cf54eb2d79d729a9c191ac7d94855585756b2e17a470ddd2b19cba91643070" +dependencies = [ + "arrayvec 0.5.1", + "bitflags", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.0", + "ena", + "indexmap", + "jobserver", + "libc", + "measureme", + "parking_lot", + "rustc-ap-rustc_graphviz 708.0.0", + "rustc-ap-rustc_index 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", "rustc-hash", "rustc-rayon", "rustc-rayon-core", @@ -989,11 +1077,31 @@ checksum = "988c7a3ecba53728d383c6bd8268c7a4c957244944c05a3f0e448795747d9db9" dependencies = [ "annotate-snippets 0.8.0", "atty", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_lint_defs", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_span", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_lint_defs 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-ap-rustc_span 706.0.0", + "termcolor", + "termize", + "tracing", + "unicode-width", + "winapi", +] + +[[package]] +name = "rustc-ap-rustc_errors" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5973e5ebae02c6a22f19176946e7a5b520270f8e9caff7e97e2e1de95c06eb79" +dependencies = [ + "annotate-snippets 0.8.0", + "atty", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_lint_defs 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_span 708.0.0", "termcolor", "termize", "tracing", @@ -1003,24 +1111,24 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "706.0.0" +version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc3de9e78a60f4d280d7d9193dc9f679489fac17fc338ac02657a6de6295f2ab" +checksum = "d112553937beffff6c801441bed60ba07cce72ce40687de722fc54e2880cd63d" dependencies = [ - "rustc-ap-rustc_ast", + "rustc-ap-rustc_ast 708.0.0", "rustc-ap-rustc_ast_passes", - "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_attr", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_errors", - "rustc-ap-rustc_feature", - "rustc-ap-rustc_lexer", - "rustc-ap-rustc_lint_defs", - "rustc-ap-rustc_macros", + "rustc-ap-rustc_ast_pretty 708.0.0", + "rustc-ap-rustc_attr 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_errors 708.0.0", + "rustc-ap-rustc_feature 708.0.0", + "rustc-ap-rustc_lexer 708.0.0", + "rustc-ap-rustc_lint_defs 708.0.0", + "rustc-ap-rustc_macros 708.0.0", "rustc-ap-rustc_parse", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_session", - "rustc-ap-rustc_span", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_session 708.0.0", + "rustc-ap-rustc_span 708.0.0", "smallvec", "tracing", ] @@ -1031,8 +1139,18 @@ version = "706.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10224171d523b2fb814e549b256ab53734abdb4d285f113cd0af887bc73150f3" dependencies = [ - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_span", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_span 706.0.0", +] + +[[package]] +name = "rustc-ap-rustc_feature" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0caa284fd8f72aaf8e04aad950ced072ba46aa88fcfa454f195e5fc02811b6b4" +dependencies = [ + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_span 708.0.0", ] [[package]] @@ -1041,12 +1159,24 @@ version = "706.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e05d63d5678f4e01bbf61189d86112783357d405a1fb63d52a70be03a8713395" +[[package]] +name = "rustc-ap-rustc_fs_util" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aecdc1324ccbb7f67a015ee6fd6d267cc189045ff3779fb63880e4f51f58711" + [[package]] name = "rustc-ap-rustc_graphviz" version = "706.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f13a83a674d50c3a2400138e4aaecd4d712921f3b8925c22691c85ae2bde235" +[[package]] +name = "rustc-ap-rustc_graphviz" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a21bff3ba32d853fbc930bebbc3c2c3bf66788873c2183a57160e2c9c7b9063d" + [[package]] name = "rustc-ap-rustc_index" version = "706.0.0" @@ -1054,8 +1184,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "469c83791194b83a480b18441da1f04dbd2671d062a9f2a1c6bc5369b2185360" dependencies = [ "arrayvec 0.5.1", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", +] + +[[package]] +name = "rustc-ap-rustc_index" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26daf768bf9ad1a492a6a93404d17c34aee58b692fd7515b6b654897e71704c5" +dependencies = [ + "arrayvec 0.5.1", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", ] [[package]] @@ -1067,18 +1208,42 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "rustc-ap-rustc_lexer" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2706fc7106c75eaea49efe9f35f719a6fdfdb95212122ec2b543659406bae7ea" +dependencies = [ + "unicode-xid", +] + [[package]] name = "rustc-ap-rustc_lint_defs" version = "706.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10363995e377811d2bd42a4700c7ffe1b8fec88c7f207036fc4b797b01941ea4" dependencies = [ - "rustc-ap-rustc_ast", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_span", - "rustc-ap-rustc_target", + "rustc-ap-rustc_ast 706.0.0", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-ap-rustc_span 706.0.0", + "rustc-ap-rustc_target 706.0.0", + "tracing", +] + +[[package]] +name = "rustc-ap-rustc_lint_defs" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "493863f3a69509b0cd53f337215ed13a459dd3687c3782fc79f7f02ad021b8d2" +dependencies = [ + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_target 708.0.0", "tracing", ] @@ -1094,21 +1259,33 @@ dependencies = [ "synstructure", ] +[[package]] +name = "rustc-ap-rustc_macros" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "288eaa669e90ebbe0d8343a4f7d09307acd68ed921c5627660f522970677a9da" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "rustc-ap-rustc_parse" -version = "706.0.0" +version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1258eef1563a45a6b319aa91311507402bbe26cf7d8eef4e5d06cc4af9edd9c" +checksum = "1d76291d0a578f974e4ef4d31db587b35db6613b057cb18e5717ed8d0781a678" dependencies = [ "bitflags", - "rustc-ap-rustc_ast", - "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_errors", - "rustc-ap-rustc_feature", - "rustc-ap-rustc_lexer", - "rustc-ap-rustc_session", - "rustc-ap-rustc_span", + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_ast_pretty 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_errors 708.0.0", + "rustc-ap-rustc_feature 708.0.0", + "rustc-ap-rustc_lexer 708.0.0", + "rustc-ap-rustc_session 708.0.0", + "rustc-ap-rustc_span 708.0.0", "smallvec", "tracing", "unicode-normalization", @@ -1124,6 +1301,16 @@ dependencies = [ "smallvec", ] +[[package]] +name = "rustc-ap-rustc_serialize" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8727f854a5ce1459c5b4fbd19b66e9a7cad81d7515374be8b5eb47f4ae799a9" +dependencies = [ + "indexmap", + "smallvec", +] + [[package]] name = "rustc-ap-rustc_session" version = "706.0.0" @@ -1133,16 +1320,38 @@ dependencies = [ "bitflags", "getopts", "num_cpus", - "rustc-ap-rustc_ast", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_errors", - "rustc-ap-rustc_feature", - "rustc-ap-rustc_fs_util", - "rustc-ap-rustc_lint_defs", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_span", - "rustc-ap-rustc_target", + "rustc-ap-rustc_ast 706.0.0", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_errors 706.0.0", + "rustc-ap-rustc_feature 706.0.0", + "rustc-ap-rustc_fs_util 706.0.0", + "rustc-ap-rustc_lint_defs 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-ap-rustc_span 706.0.0", + "rustc-ap-rustc_target 706.0.0", + "tracing", +] + +[[package]] +name = "rustc-ap-rustc_session" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1ef866957e601a40bdf4da70df294747384f66fda66a98bb92b4376668d44c1" +dependencies = [ + "bitflags", + "getopts", + "num_cpus", + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_errors 708.0.0", + "rustc-ap-rustc_feature 708.0.0", + "rustc-ap-rustc_fs_util 708.0.0", + "rustc-ap-rustc_lint_defs 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_target 708.0.0", "tracing", ] @@ -1154,11 +1363,31 @@ checksum = "12314b0cb62961245fb6f103095f0584877e54439a62cf66278a4c83d6133e1d" dependencies = [ "cfg-if 0.1.10", "md-5", - "rustc-ap-rustc_arena", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_index", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", + "rustc-ap-rustc_arena 706.0.0", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_index 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "scoped-tls", + "sha-1", + "sha2", + "tracing", + "unicode-width", +] + +[[package]] +name = "rustc-ap-rustc_span" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c9af35a8e82b7445d5ce593bd93437aa3a93c97a34845c17395c85744531e82" +dependencies = [ + "cfg-if 0.1.10", + "md-5", + "rustc-ap-rustc_arena 708.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_index 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", "scoped-tls", "sha-1", "sha2", @@ -1173,11 +1402,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0b33190c2f2cb83aea78d78c90ee5b29404ecc46abb2d9ce7c270a7c0f132e1" dependencies = [ "bitflags", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_index", - "rustc-ap-rustc_macros", - "rustc-ap-rustc_serialize", - "rustc-ap-rustc_span", + "rustc-ap-rustc_data_structures 706.0.0", + "rustc-ap-rustc_index 706.0.0", + "rustc-ap-rustc_macros 706.0.0", + "rustc-ap-rustc_serialize 706.0.0", + "rustc-ap-rustc_span 706.0.0", + "tracing", +] + +[[package]] +name = "rustc-ap-rustc_target" +version = "708.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4d7984c64589b94ba3b192fc97b288ed8c5d549176f264ffe11774c27cecf3fd" +dependencies = [ + "bitflags", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_index 708.0.0", + "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_span 708.0.0", "tracing", ] @@ -1259,15 +1503,15 @@ dependencies = [ "lazy_static", "log", "regex", - "rustc-ap-rustc_ast", - "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_attr", - "rustc-ap-rustc_data_structures", - "rustc-ap-rustc_errors", + "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_ast_pretty 708.0.0", + "rustc-ap-rustc_attr 706.0.0", + "rustc-ap-rustc_data_structures 708.0.0", + "rustc-ap-rustc_errors 708.0.0", "rustc-ap-rustc_expand", "rustc-ap-rustc_parse", - "rustc-ap-rustc_session", - "rustc-ap-rustc_span", + "rustc-ap-rustc_session 708.0.0", + "rustc-ap-rustc_span 708.0.0", "rustc-workspace-hack", "rustfmt-config_proc_macro", "serde", @@ -1383,9 +1627,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.4.2" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252" +checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e" [[package]] name = "stable_deref_trait" diff --git a/Cargo.toml b/Cargo.toml index 89aa311c52c..554fc70e8ec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" @@ -78,24 +78,24 @@ version = "706.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "706.0.0" +version = "708.0.0" From 0e12bba68bcdd63726c4ea30b0e69113cbec8c40 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 14 Mar 2021 13:15:48 -0500 Subject: [PATCH 02/15] chore: add span creation util function --- Cargo.lock | 426 +++++++++++------------------------------------- Cargo.toml | 2 +- src/patterns.rs | 4 +- src/utils.rs | 4 + 4 files changed, 99 insertions(+), 337 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bf7db5aa59..6689d6cfe01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -878,15 +878,6 @@ dependencies = [ "crossbeam-utils 0.6.5", ] -[[package]] -name = "rustc-ap-rustc_arena" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705baf7965088195f2e85d0bc548036d7e6a94973c309819f2ae4540e221ba15" -dependencies = [ - "smallvec", -] - [[package]] name = "rustc-ap-rustc_arena" version = "708.0.0" @@ -896,23 +887,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "rustc-ap-rustc_ast" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5579379dd7e34bb522cbab946df43921f3d6fa587fc9101358db0a26b177b24" -dependencies = [ - "bitflags", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_index 706.0.0", - "rustc-ap-rustc_lexer 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-ap-rustc_span 706.0.0", - "smallvec", - "tracing", -] - [[package]] name = "rustc-ap-rustc_ast" version = "708.0.0" @@ -920,12 +894,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5415b0026ca0198717b04d9a579c941ca34089bc921d3f02cff1b6cf63fa95c9" dependencies = [ "bitflags", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_index 708.0.0", - "rustc-ap-rustc_lexer 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_index", + "rustc-ap-rustc_lexer", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_span", "smallvec", "tracing", ] @@ -937,26 +911,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1737c6420474739cb89f557ed8d1231f0b6068620fb3c0fd0a09f0dd79aebbb9" dependencies = [ "itertools 0.9.0", - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_ast_pretty 708.0.0", - "rustc-ap-rustc_attr 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_errors 708.0.0", - "rustc-ap-rustc_feature 708.0.0", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_ast_pretty", + "rustc-ap-rustc_attr", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_feature", "rustc-ap-rustc_parse", - "rustc-ap-rustc_session 708.0.0", - "rustc-ap-rustc_span 708.0.0", - "tracing", -] - -[[package]] -name = "rustc-ap-rustc_ast_pretty" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11fe1dbcfbb58ea768a9a05a9df27093b4a8fe03b715d3d96df84ae1093b3859" -dependencies = [ - "rustc-ap-rustc_ast 706.0.0", - "rustc-ap-rustc_span 706.0.0", + "rustc-ap-rustc_session", + "rustc-ap-rustc_span", "tracing", ] @@ -966,76 +929,27 @@ version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e86b6a279fd02e57590834a489eb4a4fe31d03c176f755072505977a4d5f202" dependencies = [ - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_span", "tracing", ] -[[package]] -name = "rustc-ap-rustc_attr" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9429e42aaf0b12e133b93411bb8205388fba4fe3dd819199ae52672ad21b81a0" -dependencies = [ - "rustc-ap-rustc_ast 706.0.0", - "rustc-ap-rustc_ast_pretty 706.0.0", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_errors 706.0.0", - "rustc-ap-rustc_feature 706.0.0", - "rustc-ap-rustc_lexer 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-ap-rustc_session 706.0.0", - "rustc-ap-rustc_span 706.0.0", -] - [[package]] name = "rustc-ap-rustc_attr" version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f31de4bc77d5fc437a50451ac12d3e2459f6794d8e7f50bd6c0f48ec6744b96f" dependencies = [ - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_ast_pretty 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_errors 708.0.0", - "rustc-ap-rustc_feature 708.0.0", - "rustc-ap-rustc_lexer 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_session 708.0.0", - "rustc-ap-rustc_span 708.0.0", -] - -[[package]] -name = "rustc-ap-rustc_data_structures" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70bc6c6857800146381494c5247d5b86502e4a25a71fea67d2db58f14f22d6ce" -dependencies = [ - "arrayvec 0.5.1", - "bitflags", - "cfg-if 0.1.10", - "crossbeam-utils 0.7.0", - "ena", - "indexmap", - "jobserver", - "libc", - "measureme", - "parking_lot", - "rustc-ap-rustc_graphviz 706.0.0", - "rustc-ap-rustc_index 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-hash", - "rustc-rayon", - "rustc-rayon-core", - "smallvec", - "stable_deref_trait", - "stacker", - "tempfile", - "tracing", - "winapi", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_ast_pretty", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_feature", + "rustc-ap-rustc_lexer", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_session", + "rustc-ap-rustc_span", ] [[package]] @@ -1054,10 +968,10 @@ dependencies = [ "libc", "measureme", "parking_lot", - "rustc-ap-rustc_graphviz 708.0.0", - "rustc-ap-rustc_index 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_graphviz", + "rustc-ap-rustc_index", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", "rustc-hash", "rustc-rayon", "rustc-rayon-core", @@ -1069,26 +983,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rustc-ap-rustc_errors" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "988c7a3ecba53728d383c6bd8268c7a4c957244944c05a3f0e448795747d9db9" -dependencies = [ - "annotate-snippets 0.8.0", - "atty", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_lint_defs 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-ap-rustc_span 706.0.0", - "termcolor", - "termize", - "tracing", - "unicode-width", - "winapi", -] - [[package]] name = "rustc-ap-rustc_errors" version = "708.0.0" @@ -1097,11 +991,11 @@ checksum = "5973e5ebae02c6a22f19176946e7a5b520270f8e9caff7e97e2e1de95c06eb79" dependencies = [ "annotate-snippets 0.8.0", "atty", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_lint_defs 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_lint_defs", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_span", "termcolor", "termize", "tracing", @@ -1115,79 +1009,46 @@ version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d112553937beffff6c801441bed60ba07cce72ce40687de722fc54e2880cd63d" dependencies = [ - "rustc-ap-rustc_ast 708.0.0", + "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", - "rustc-ap-rustc_ast_pretty 708.0.0", - "rustc-ap-rustc_attr 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_errors 708.0.0", - "rustc-ap-rustc_feature 708.0.0", - "rustc-ap-rustc_lexer 708.0.0", - "rustc-ap-rustc_lint_defs 708.0.0", - "rustc-ap-rustc_macros 708.0.0", + "rustc-ap-rustc_ast_pretty", + "rustc-ap-rustc_attr", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_feature", + "rustc-ap-rustc_lexer", + "rustc-ap-rustc_lint_defs", + "rustc-ap-rustc_macros", "rustc-ap-rustc_parse", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_session 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_session", + "rustc-ap-rustc_span", "smallvec", "tracing", ] -[[package]] -name = "rustc-ap-rustc_feature" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10224171d523b2fb814e549b256ab53734abdb4d285f113cd0af887bc73150f3" -dependencies = [ - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_span 706.0.0", -] - [[package]] name = "rustc-ap-rustc_feature" version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0caa284fd8f72aaf8e04aad950ced072ba46aa88fcfa454f195e5fc02811b6b4" dependencies = [ - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_span", ] -[[package]] -name = "rustc-ap-rustc_fs_util" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05d63d5678f4e01bbf61189d86112783357d405a1fb63d52a70be03a8713395" - [[package]] name = "rustc-ap-rustc_fs_util" version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8aecdc1324ccbb7f67a015ee6fd6d267cc189045ff3779fb63880e4f51f58711" -[[package]] -name = "rustc-ap-rustc_graphviz" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f13a83a674d50c3a2400138e4aaecd4d712921f3b8925c22691c85ae2bde235" - [[package]] name = "rustc-ap-rustc_graphviz" version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a21bff3ba32d853fbc930bebbc3c2c3bf66788873c2183a57160e2c9c7b9063d" -[[package]] -name = "rustc-ap-rustc_index" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469c83791194b83a480b18441da1f04dbd2671d062a9f2a1c6bc5369b2185360" -dependencies = [ - "arrayvec 0.5.1", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", -] - [[package]] name = "rustc-ap-rustc_index" version = "708.0.0" @@ -1195,17 +1056,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26daf768bf9ad1a492a6a93404d17c34aee58b692fd7515b6b654897e71704c5" dependencies = [ "arrayvec 0.5.1", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", -] - -[[package]] -name = "rustc-ap-rustc_lexer" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f76b414e6f4a136e04c5b2d79785fbf689b6c975f7f40c9fbe314dd9e4345a5" -dependencies = [ - "unicode-xid", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", ] [[package]] @@ -1217,48 +1069,21 @@ dependencies = [ "unicode-xid", ] -[[package]] -name = "rustc-ap-rustc_lint_defs" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10363995e377811d2bd42a4700c7ffe1b8fec88c7f207036fc4b797b01941ea4" -dependencies = [ - "rustc-ap-rustc_ast 706.0.0", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-ap-rustc_span 706.0.0", - "rustc-ap-rustc_target 706.0.0", - "tracing", -] - [[package]] name = "rustc-ap-rustc_lint_defs" version = "708.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "493863f3a69509b0cd53f337215ed13a459dd3687c3782fc79f7f02ad021b8d2" dependencies = [ - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_span 708.0.0", - "rustc-ap-rustc_target 708.0.0", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_span", + "rustc-ap-rustc_target", "tracing", ] -[[package]] -name = "rustc-ap-rustc_macros" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33e106ab6d8fcd906b8e0efd48d14bca07cc7a591a938a0a8844badb8d253897" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "rustc-ap-rustc_macros" version = "708.0.0" @@ -1278,29 +1103,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d76291d0a578f974e4ef4d31db587b35db6613b057cb18e5717ed8d0781a678" dependencies = [ "bitflags", - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_ast_pretty 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_errors 708.0.0", - "rustc-ap-rustc_feature 708.0.0", - "rustc-ap-rustc_lexer 708.0.0", - "rustc-ap-rustc_session 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_ast_pretty", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_feature", + "rustc-ap-rustc_lexer", + "rustc-ap-rustc_session", + "rustc-ap-rustc_span", "smallvec", "tracing", "unicode-normalization", ] -[[package]] -name = "rustc-ap-rustc_serialize" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5791d0d7b4b8f5ab89c80e0558aaae6cc3784b9cd1db5f239f7fa51e618e73" -dependencies = [ - "indexmap", - "smallvec", -] - [[package]] name = "rustc-ap-rustc_serialize" version = "708.0.0" @@ -1311,28 +1126,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "rustc-ap-rustc_session" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0662079826bfb6543f4c261049d497feb5686f71aabdba13befa2f6f41a628" -dependencies = [ - "bitflags", - "getopts", - "num_cpus", - "rustc-ap-rustc_ast 706.0.0", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_errors 706.0.0", - "rustc-ap-rustc_feature 706.0.0", - "rustc-ap-rustc_fs_util 706.0.0", - "rustc-ap-rustc_lint_defs 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-ap-rustc_span 706.0.0", - "rustc-ap-rustc_target 706.0.0", - "tracing", -] - [[package]] name = "rustc-ap-rustc_session" version = "708.0.0" @@ -1342,39 +1135,19 @@ dependencies = [ "bitflags", "getopts", "num_cpus", - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_errors 708.0.0", - "rustc-ap-rustc_feature 708.0.0", - "rustc-ap-rustc_fs_util 708.0.0", - "rustc-ap-rustc_lint_defs 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_span 708.0.0", - "rustc-ap-rustc_target 708.0.0", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", + "rustc-ap-rustc_feature", + "rustc-ap-rustc_fs_util", + "rustc-ap-rustc_lint_defs", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_span", + "rustc-ap-rustc_target", "tracing", ] -[[package]] -name = "rustc-ap-rustc_span" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12314b0cb62961245fb6f103095f0584877e54439a62cf66278a4c83d6133e1d" -dependencies = [ - "cfg-if 0.1.10", - "md-5", - "rustc-ap-rustc_arena 706.0.0", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_index 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "scoped-tls", - "sha-1", - "sha2", - "tracing", - "unicode-width", -] - [[package]] name = "rustc-ap-rustc_span" version = "708.0.0" @@ -1383,11 +1156,11 @@ checksum = "5c9af35a8e82b7445d5ce593bd93437aa3a93c97a34845c17395c85744531e82" dependencies = [ "cfg-if 0.1.10", "md-5", - "rustc-ap-rustc_arena 708.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_index 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", + "rustc-ap-rustc_arena", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_index", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", "scoped-tls", "sha-1", "sha2", @@ -1395,21 +1168,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "rustc-ap-rustc_target" -version = "706.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0b33190c2f2cb83aea78d78c90ee5b29404ecc46abb2d9ce7c270a7c0f132e1" -dependencies = [ - "bitflags", - "rustc-ap-rustc_data_structures 706.0.0", - "rustc-ap-rustc_index 706.0.0", - "rustc-ap-rustc_macros 706.0.0", - "rustc-ap-rustc_serialize 706.0.0", - "rustc-ap-rustc_span 706.0.0", - "tracing", -] - [[package]] name = "rustc-ap-rustc_target" version = "708.0.0" @@ -1417,11 +1175,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d7984c64589b94ba3b192fc97b288ed8c5d549176f264ffe11774c27cecf3fd" dependencies = [ "bitflags", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_index 708.0.0", - "rustc-ap-rustc_macros 708.0.0", - "rustc-ap-rustc_serialize 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_index", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_span", "tracing", ] @@ -1503,15 +1261,15 @@ dependencies = [ "lazy_static", "log", "regex", - "rustc-ap-rustc_ast 708.0.0", - "rustc-ap-rustc_ast_pretty 708.0.0", - "rustc-ap-rustc_attr 706.0.0", - "rustc-ap-rustc_data_structures 708.0.0", - "rustc-ap-rustc_errors 708.0.0", + "rustc-ap-rustc_ast", + "rustc-ap-rustc_ast_pretty", + "rustc-ap-rustc_attr", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_errors", "rustc-ap-rustc_expand", "rustc-ap-rustc_parse", - "rustc-ap-rustc_session 708.0.0", - "rustc-ap-rustc_span 708.0.0", + "rustc-ap-rustc_session", + "rustc-ap-rustc_span", "rustc-workspace-hack", "rustfmt-config_proc_macro", "serde", diff --git a/Cargo.toml b/Cargo.toml index 554fc70e8ec..84e0f0b5806 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -74,7 +74,7 @@ version = "708.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" -version = "706.0.0" +version = "708.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" diff --git a/src/patterns.rs b/src/patterns.rs index 5847bd08d80..f9a9388e4ab 100644 --- a/src/patterns.rs +++ b/src/patterns.rs @@ -17,7 +17,7 @@ use crate::shape::Shape; use crate::source_map::SpanUtils; use crate::spanned::Spanned; use crate::types::{rewrite_path, PathContext}; -use crate::utils::{format_mutability, mk_sp, rewrite_ident}; +use crate::utils::{format_mutability, mk_sp, mk_sp_lo_plus_one, rewrite_ident}; /// Returns `true` if the given pattern is "short". /// A short pattern is defined by the following grammar: @@ -460,7 +460,7 @@ fn rewrite_tuple_pat( let sp = pat_vec[new_item_count - 1].span(); let snippet = context.snippet(sp); let lo = sp.lo() + BytePos(snippet.find_uncommented("_").unwrap() as u32); - pat_vec[new_item_count - 1] = TuplePatField::Dotdot(mk_sp(lo, lo + BytePos(1))); + pat_vec[new_item_count - 1] = TuplePatField::Dotdot(mk_sp_lo_plus_one(lo)); ( &pat_vec[..new_item_count], mk_sp(span.lo(), lo + BytePos(1)), diff --git a/src/utils.rs b/src/utils.rs index a3d0ed050e3..d3c349fb701 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -360,6 +360,10 @@ pub(crate) fn mk_sp(lo: BytePos, hi: BytePos) -> Span { Span::new(lo, hi, SyntaxContext::root()) } +pub(crate) fn mk_sp_lo_plus_one(lo: BytePos) -> Span { + Span::new(lo, lo + BytePos(1), SyntaxContext::root()) +} + // Returns `true` if the given span does not intersect with file lines. macro_rules! out_of_file_lines_range { ($self:ident, $span:expr) => { From f9f2b1c37a238d96250ad6609ffb3358df3ad5fb Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 14 Mar 2021 13:16:52 -0500 Subject: [PATCH 03/15] chore: apply pattern parsing changes --- src/macros.rs | 2 +- src/matches.rs | 21 +++++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/macros.rs b/src/macros.rs index 1abb1cd9e13..190f4b599b0 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -132,7 +132,7 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option { ); parse_macro_arg!( Pat, - |parser: &mut rustc_parse::parser::Parser<'b>| parser.parse_pat(None), + |parser: &mut rustc_parse::parser::Parser<'b>| parser.parse_pat_no_top_alt(None), |x: ptr::P| Some(x) ); // `parse_item` returns `Option>`. diff --git a/src/matches.rs b/src/matches.rs index a43aed09ef5..f33fedce92d 100644 --- a/src/matches.rs +++ b/src/matches.rs @@ -19,7 +19,7 @@ use crate::source_map::SpanUtils; use crate::spanned::Spanned; use crate::utils::{ contains_skip, extra_offset, first_line_width, inner_attributes, last_line_extendable, mk_sp, - semicolon_for_expr, trimmed_last_line_width, unicode_str_width, + mk_sp_lo_plus_one, semicolon_for_expr, trimmed_last_line_width, unicode_str_width, }; /// A simple wrapper type against `ast::Arm`. Used inside `write_list()`. @@ -163,17 +163,14 @@ fn arm_comma(config: &Config, body: &ast::Expr, is_last: bool) -> &'static str { fn collect_beginning_verts( context: &RewriteContext<'_>, arms: &[ast::Arm], - span: Span, ) -> Vec> { - let mut beginning_verts = Vec::with_capacity(arms.len()); - let mut lo = context.snippet_provider.span_after(span, "{"); - for arm in arms { - let hi = arm.pat.span.lo(); - let missing_span = mk_sp(lo, hi); - beginning_verts.push(context.snippet_provider.opt_span_before(missing_span, "|")); - lo = arm.span().hi(); - } - beginning_verts + arms.iter() + .map(|a| { + context + .snippet_provider + .opt_span_before(mk_sp_lo_plus_one(a.pat.span.lo()), "|") + }) + .collect() } fn rewrite_match_arms( @@ -191,7 +188,7 @@ fn rewrite_match_arms( let is_last_iter = repeat(false) .take(arm_len.saturating_sub(1)) .chain(repeat(true)); - let beginning_verts = collect_beginning_verts(context, arms, span); + let beginning_verts = collect_beginning_verts(context, arms); let items = itemize_list( context.snippet_provider, arms.iter() From c3d0237f84fd1a9b008ea0357dca93b0d93b5d41 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 28 Mar 2021 16:25:30 -0500 Subject: [PATCH 04/15] refactor: apply rustc mod parsing changes --- src/formatting.rs | 2 +- src/items.rs | 4 +- src/modules.rs | 159 ++++++++++++++++++++++++++++++------------- src/syntux/parser.rs | 6 +- src/visitor.rs | 29 ++++---- 5 files changed, 130 insertions(+), 70 deletions(-) diff --git a/src/formatting.rs b/src/formatting.rs index e42864a5055..2c38de04797 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -145,7 +145,7 @@ impl<'a, T: FormatHandler + 'a> FormatContext<'a, T> { module: &Module<'_>, is_macro_def: bool, ) -> Result<(), ErrorKind> { - let snippet_provider = self.parse_session.snippet_provider(module.as_ref().inner); + let snippet_provider = self.parse_session.snippet_provider(module.span); let mut visitor = FmtVisitor::from_parse_sess( &self.parse_session, &self.config, diff --git a/src/items.rs b/src/items.rs index 6cdbb686ad8..00757210ce5 100644 --- a/src/items.rs +++ b/src/items.rs @@ -3271,8 +3271,8 @@ pub(crate) fn rewrite_extern_crate( /// Returns `true` for `mod foo;`, false for `mod foo { .. }`. pub(crate) fn is_mod_decl(item: &ast::Item) -> bool { match item.kind { - ast::ItemKind::Mod(ref m) => m.inner.hi() != item.span.hi(), - _ => false, + ast::ItemKind::Mod(_, ast::ModKind::Loaded(_, ast::Inline::Yes, _)) => false, + _ => true, } } diff --git a/src/modules.rs b/src/modules.rs index eaa889bcb3f..2ee3639ffb1 100644 --- a/src/modules.rs +++ b/src/modules.rs @@ -6,6 +6,7 @@ use rustc_ast::ast; use rustc_ast::attr::HasAttrs; use rustc_ast::visit::Visitor; use rustc_span::symbol::{self, sym, Symbol}; +use rustc_span::Span; use thiserror::Error; use crate::attr::MetaVisitor; @@ -24,20 +25,31 @@ type FileModMap<'ast> = BTreeMap>; /// Represents module with its inner attributes. #[derive(Debug, Clone)] pub(crate) struct Module<'a> { - ast_mod: Cow<'a, ast::Mod>, + ast_mod_kind: Option>, + pub(crate) items: Cow<'a, Vec>>, + attrs: Cow<'a, Vec>, inner_attr: Vec, + pub(crate) span: Span, } impl<'a> Module<'a> { - pub(crate) fn new(ast_mod: Cow<'a, ast::Mod>, attrs: &[ast::Attribute]) -> Self { - let inner_attr = attrs + pub(crate) fn new( + mod_span: Span, + ast_mod_kind: Option>, + mod_items: Cow<'a, Vec>>, + mod_attrs: Cow<'a, Vec>, + ) -> Self { + let inner_attr = mod_attrs .iter() .filter(|attr| attr.style == ast::AttrStyle::Inner) .cloned() .collect(); Module { - ast_mod, + items: mod_items, + attrs: mod_attrs, inner_attr, + span: mod_span, + ast_mod_kind, } } } @@ -51,12 +63,6 @@ impl<'a> HasAttrs for Module<'a> { } } -impl<'a> AsRef for Module<'a> { - fn as_ref(&self) -> &ast::Mod { - &self.ast_mod - } -} - /// Maps each module to the corresponding file. pub(crate) struct ModResolver<'ast, 'sess> { parse_sess: &'sess ParseSess, @@ -124,12 +130,17 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { // Skip visiting sub modules when the input is from stdin. if self.recursive { - self.visit_mod_from_ast(&krate.module)?; + self.visit_mod_from_ast(&krate.items)?; } self.file_map.insert( root_filename, - Module::new(Cow::Borrowed(&krate.module), &krate.attrs), + Module::new( + krate.span, + None, + Cow::Borrowed(&krate.items), + Cow::Borrowed(&krate.attrs), + ), ); Ok(self.file_map) } @@ -139,10 +150,15 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { let mut visitor = visitor::CfgIfVisitor::new(self.parse_sess); visitor.visit_item(&item); for module_item in visitor.mods() { - if let ast::ItemKind::Mod(ref sub_mod) = module_item.item.kind { + if let ast::ItemKind::Mod(_, ref sub_mod_kind) = module_item.item.kind { self.visit_sub_mod( &module_item.item, - Module::new(Cow::Owned(sub_mod.clone()), &module_item.item.attrs), + Module::new( + module_item.item.span, + Some(Cow::Owned(sub_mod_kind.clone())), + Cow::Owned(vec![]), + Cow::Owned(vec![]), + ), )?; } } @@ -150,29 +166,53 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { } /// Visit modules defined inside macro calls. - fn visit_mod_outside_ast(&mut self, module: ast::Mod) -> Result<(), ModuleResolutionError> { - for item in module.items { + fn visit_mod_outside_ast( + &mut self, + items: Vec>, + ) -> Result<(), ModuleResolutionError> { + for item in items { if is_cfg_if(&item) { self.visit_cfg_if(Cow::Owned(item.into_inner()))?; continue; } - if let ast::ItemKind::Mod(ref sub_mod) = item.kind { - self.visit_sub_mod(&item, Module::new(Cow::Owned(sub_mod.clone()), &item.attrs))?; + if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind { + let span = item.span; + self.visit_sub_mod( + &item, + Module::new( + span, + Some(Cow::Owned(sub_mod_kind.clone())), + Cow::Owned(vec![]), + Cow::Owned(vec![]), + ), + )?; } } Ok(()) } /// Visit modules from AST. - fn visit_mod_from_ast(&mut self, module: &'ast ast::Mod) -> Result<(), ModuleResolutionError> { - for item in &module.items { + fn visit_mod_from_ast( + &mut self, + items: &'ast Vec>, + ) -> Result<(), ModuleResolutionError> { + for item in items { if is_cfg_if(item) { self.visit_cfg_if(Cow::Borrowed(item))?; } - if let ast::ItemKind::Mod(ref sub_mod) = item.kind { - self.visit_sub_mod(item, Module::new(Cow::Borrowed(sub_mod), &item.attrs))?; + if let ast::ItemKind::Mod(_, ref sub_mod_kind) = item.kind { + let span = item.span; + self.visit_sub_mod( + item, + Module::new( + span, + Some(Cow::Borrowed(sub_mod_kind)), + Cow::Owned(vec![]), + Cow::Borrowed(&item.attrs), + ), + )?; } } Ok(()) @@ -273,9 +313,12 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { if let Some(directory) = directory { self.directory = directory; } - match sub_mod.ast_mod { - Cow::Borrowed(sub_mod) => self.visit_mod_from_ast(sub_mod), - Cow::Owned(sub_mod) => self.visit_mod_outside_ast(sub_mod), + match (sub_mod.ast_mod_kind, sub_mod.items) { + (Some(Cow::Borrowed(ast::ModKind::Loaded(items, ast::Inline::No, _))), _) => { + self.visit_mod_from_ast(&items) + } + (Some(Cow::Owned(..)), Cow::Owned(items)) => self.visit_mod_outside_ast(items), + (_, _) => Ok(()), } } @@ -294,13 +337,17 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { if self.parse_sess.is_file_parsed(&path) { return Ok(None); } - return match Parser::parse_file_as_module(self.parse_sess, &path, sub_mod.ast_mod.inner) - { - Ok((_, ref attrs)) if contains_skip(attrs) => Ok(None), - Ok(m) => Ok(Some(SubModKind::External( + return match Parser::parse_file_as_module(self.parse_sess, &path, sub_mod.span) { + Ok((ref attrs, _, _)) if contains_skip(attrs) => Ok(None), + Ok((attrs, items, span)) => Ok(Some(SubModKind::External( path, DirectoryOwnership::Owned { relative: None }, - Module::new(Cow::Owned(m.0), &m.1), + Module::new( + span, + Some(Cow::Owned(ast::ModKind::Unloaded)), + Cow::Owned(items), + Cow::Owned(attrs), + ), ))), Err(ParserError::ParseError) => Err(ModuleResolutionError { module: mod_name.to_string(), @@ -338,18 +385,30 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { return Ok(Some(SubModKind::MultiExternal(mods_outside_ast))); } } - match Parser::parse_file_as_module(self.parse_sess, &path, sub_mod.ast_mod.inner) { - Ok((_, ref attrs)) if contains_skip(attrs) => Ok(None), - Ok(m) if outside_mods_empty => Ok(Some(SubModKind::External( - path, - ownership, - Module::new(Cow::Owned(m.0), &m.1), - ))), - Ok(m) => { + match Parser::parse_file_as_module(self.parse_sess, &path, sub_mod.span) { + Ok((ref attrs, _, _)) if contains_skip(attrs) => Ok(None), + Ok((attrs, items, span)) if outside_mods_empty => { + Ok(Some(SubModKind::External( + path, + ownership, + Module::new( + span, + Some(Cow::Owned(ast::ModKind::Unloaded)), + Cow::Owned(items), + Cow::Owned(attrs), + ), + ))) + } + Ok((attrs, items, span)) => { mods_outside_ast.push(( path.clone(), ownership, - Module::new(Cow::Owned(m.0), &m.1), + Module::new( + span, + Some(Cow::Owned(ast::ModKind::Unloaded)), + Cow::Owned(items), + Cow::Owned(attrs), + ), )); if should_insert { mods_outside_ast.push((path, ownership, sub_mod.clone())); @@ -437,20 +496,22 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { )); continue; } - let m = match Parser::parse_file_as_module( - self.parse_sess, - &actual_path, - sub_mod.ast_mod.inner, - ) { - Ok((_, ref attrs)) if contains_skip(attrs) => continue, - Ok(m) => m, - Err(..) => continue, - }; + let (attrs, items, span) = + match Parser::parse_file_as_module(self.parse_sess, &actual_path, sub_mod.span) { + Ok((ref attrs, _, _)) if contains_skip(attrs) => continue, + Ok(m) => m, + Err(..) => continue, + }; result.push(( actual_path, DirectoryOwnership::Owned { relative: None }, - Module::new(Cow::Owned(m.0), &m.1), + Module::new( + span, + Some(Cow::Owned(ast::ModKind::Unloaded)), + Cow::Owned(items), + Cow::Owned(attrs), + ), )) } result diff --git a/src/syntux/parser.rs b/src/syntux/parser.rs index 5c555e06a80..29248ced2ff 100644 --- a/src/syntux/parser.rs +++ b/src/syntux/parser.rs @@ -1,8 +1,8 @@ use std::panic::{catch_unwind, AssertUnwindSafe}; use std::path::{Path, PathBuf}; -use rustc_ast::ast; use rustc_ast::token::{DelimToken, TokenKind}; +use rustc_ast::{ast, ptr}; use rustc_errors::Diagnostic; use rustc_parse::{ new_parser_from_file, @@ -109,10 +109,10 @@ impl<'a> Parser<'a> { sess: &'a ParseSess, path: &Path, span: Span, - ) -> Result<(ast::Mod, Vec), ParserError> { + ) -> Result<(Vec, Vec>, Span), ParserError> { let result = catch_unwind(AssertUnwindSafe(|| { let mut parser = new_parser_from_file(sess.inner(), &path, Some(span)); - match parser.parse_mod(&TokenKind::Eof, ast::Unsafe::No) { + match parser.parse_mod(&TokenKind::Eof) { Ok(result) => Some(result), Err(mut e) => { sess.emit_or_cancel_diagnostic(&mut e); diff --git a/src/visitor.rs b/src/visitor.rs index 34e8536b7ee..4cd6b8d56d1 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -524,10 +524,9 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { self.visit_enum(item.ident, &item.vis, def, generics, item.span); self.last_pos = source!(self, item.span).hi(); } - ast::ItemKind::Mod(ref module) => { - let is_inline = !is_mod_decl(item); + ast::ItemKind::Mod(unsafety, ref mod_kind) => { self.format_missing_with_indent(source!(self, item.span).lo()); - self.format_mod(module, &item.vis, item.span, item.ident, attrs, is_inline); + self.format_mod(mod_kind, unsafety, &item.vis, item.span, item.ident, attrs); } ast::ItemKind::MacCall(ref mac) => { self.visit_mac(mac, Some(item.ident), MacroPosition::Item); @@ -921,8 +920,8 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { !is_skip_attr(segments) } - fn walk_mod_items(&mut self, m: &ast::Mod) { - self.visit_items_with_reordering(&ptr_vec_to_ref_vec(&m.items)); + fn walk_mod_items(&mut self, items: &Vec>) { + self.visit_items_with_reordering(&ptr_vec_to_ref_vec(&items)); } fn walk_stmts(&mut self, stmts: &[Stmt<'_>], include_current_empty_semi: bool) { @@ -974,22 +973,22 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { fn format_mod( &mut self, - m: &ast::Mod, + mod_kind: &ast::ModKind, + unsafety: ast::Unsafe, vis: &ast::Visibility, s: Span, ident: symbol::Ident, attrs: &[ast::Attribute], - is_internal: bool, ) { let vis_str = utils::format_visibility(&self.get_context(), vis); self.push_str(&*vis_str); - self.push_str(format_unsafety(m.unsafety)); + self.push_str(format_unsafety(unsafety)); self.push_str("mod "); // Calling `to_owned()` to work around borrow checker. let ident_str = rewrite_ident(&self.get_context(), ident).to_owned(); self.push_str(&ident_str); - if is_internal { + if let ast::ModKind::Loaded(ref items, ast::Inline::Yes, inner_span) = mod_kind { match self.config.brace_style() { BraceStyle::AlwaysNextLine => { let indent_str = self.block_indent.to_string_with_newline(self.config); @@ -1001,7 +1000,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { // Hackery to account for the closing }. let mod_lo = self.snippet_provider.span_after(source!(self, s), "{"); let body_snippet = - self.snippet(mk_sp(mod_lo, source!(self, m.inner).hi() - BytePos(1))); + self.snippet(mk_sp(mod_lo, source!(self, inner_span).hi() - BytePos(1))); let body_snippet = body_snippet.trim(); if body_snippet.is_empty() { self.push_str("}"); @@ -1009,11 +1008,11 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { self.last_pos = mod_lo; self.block_indent = self.block_indent.block_indent(self.config); self.visit_attrs(attrs, ast::AttrStyle::Inner); - self.walk_mod_items(m); - let missing_span = self.next_span(m.inner.hi() - BytePos(1)); + self.walk_mod_items(items); + let missing_span = self.next_span(inner_span.hi() - BytePos(1)); self.close_block(missing_span, false); } - self.last_pos = source!(self, m.inner).hi(); + self.last_pos = source!(self, inner_span).hi(); } else { self.push_str(";"); self.last_pos = source!(self, s).hi(); @@ -1023,9 +1022,9 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { pub(crate) fn format_separate_mod(&mut self, m: &Module<'_>, end_pos: BytePos) { self.block_indent = Indent::empty(); if self.visit_attrs(m.attrs(), ast::AttrStyle::Inner) { - self.push_skipped_with_span(m.attrs(), m.as_ref().inner, m.as_ref().inner); + self.push_skipped_with_span(m.attrs(), m.span, m.span); } else { - self.walk_mod_items(m.as_ref()); + self.walk_mod_items(&m.items); self.format_missing_with_indent(end_pos); } } From 5769a021a773c5d0021b297facf31dbfb8403e90 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 14 Mar 2021 13:43:33 -0500 Subject: [PATCH 05/15] deps: bump rustc-ap crates to v709 --- Cargo.lock | 106 ++++++++++++++++++++++++++++++++--------------------- Cargo.toml | 16 ++++---- 2 files changed, 72 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6689d6cfe01..fe1efb2ddf4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -598,11 +598,14 @@ dependencies = [ [[package]] name = "measureme" -version = "9.0.0" +version = "9.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22bf8d885d073610aee20e7fa205c4341ed32a761dbde96da5fd96301a8d3e82" +checksum = "4a98e07fe802486895addb2b5467f33f205e82c426bfaf350f5d8109b137767c" dependencies = [ + "log", + "memmap", "parking_lot", + "perf-event-open-sys", "rustc-hash", "smallvec", ] @@ -613,6 +616,16 @@ version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" +[[package]] +name = "memmap" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "memoffset" version = "0.5.1" @@ -678,6 +691,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "perf-event-open-sys" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce9bedf5da2c234fdf2391ede2b90fabf585355f33100689bc364a3ea558561a" +dependencies = [ + "libc", +] + [[package]] name = "ppv-lite86" version = "0.2.9" @@ -880,18 +902,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c0f30a24b4e286e7f691e444484b985f93bb4724e1c8f656ebb3f3a725472c6" +checksum = "7e5092e79ef393b11a2c0aa357445996010f2d4cd8b78f23353f4ba10fef9263" dependencies = [ "smallvec", ] [[package]] name = "rustc-ap-rustc_ast" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5415b0026ca0198717b04d9a579c941ca34089bc921d3f02cff1b6cf63fa95c9" +checksum = "f36b5265de3c7e3e811b568558cad58deb051567e96ed98cce825db9754ec08c" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -906,9 +928,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_passes" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1737c6420474739cb89f557ed8d1231f0b6068620fb3c0fd0a09f0dd79aebbb9" +checksum = "f938d487455271d339d8659a020173cba9c2adae49da02a38414e3d67951d538" dependencies = [ "itertools 0.9.0", "rustc-ap-rustc_ast", @@ -925,9 +947,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e86b6a279fd02e57590834a489eb4a4fe31d03c176f755072505977a4d5f202" +checksum = "1341f5a50543daf575f28626a6928eac2cdd1edb92982c09aa61c8fd31755180" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_span", @@ -936,9 +958,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_attr" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31de4bc77d5fc437a50451ac12d3e2459f6794d8e7f50bd6c0f48ec6744b96f" +checksum = "69f5d82bc8c6e623d5724fe17b123d60ab0a6219ab62c38c66e05f52d5455b73" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", @@ -954,9 +976,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_data_structures" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49cf54eb2d79d729a9c191ac7d94855585756b2e17a470ddd2b19cba91643070" +checksum = "8e9358f2141b06ba67135d8c5069cb1eadf7f82dac150c035a382105e3f1eb5f" dependencies = [ "arrayvec 0.5.1", "bitflags", @@ -985,9 +1007,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5973e5ebae02c6a22f19176946e7a5b520270f8e9caff7e97e2e1de95c06eb79" +checksum = "2739595a237062f3f671f4270c967e1b753c8b2f365dfc7c6832f69680341520" dependencies = [ "annotate-snippets 0.8.0", "atty", @@ -1005,9 +1027,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d112553937beffff6c801441bed60ba07cce72ce40687de722fc54e2880cd63d" +checksum = "f6f2b0742ca49b895efa3ce1cb88cee83680f256178f94c7e98686b47787ff85" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", @@ -1029,9 +1051,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_feature" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0caa284fd8f72aaf8e04aad950ced072ba46aa88fcfa454f195e5fc02811b6b4" +checksum = "80cfd636f98089b37eaf86706b03149a0ae28dad3394b6a01eb89b1a209d54d4" dependencies = [ "rustc-ap-rustc_data_structures", "rustc-ap-rustc_span", @@ -1039,21 +1061,21 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_fs_util" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8aecdc1324ccbb7f67a015ee6fd6d267cc189045ff3779fb63880e4f51f58711" +checksum = "088f185b74e6c6c008a2a600bb9c640c550626f5cab30192a60432478ae6a71e" [[package]] name = "rustc-ap-rustc_graphviz" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21bff3ba32d853fbc930bebbc3c2c3bf66788873c2183a57160e2c9c7b9063d" +checksum = "d77819471ffc27b1688996badb18dada37da22428cbd53485c0a17cf552e6b64" [[package]] name = "rustc-ap-rustc_index" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26daf768bf9ad1a492a6a93404d17c34aee58b692fd7515b6b654897e71704c5" +checksum = "cd66b37ab3adba14c4ee3e25a749f0a0b1aa47611027fff35f2c8f3ff5a687c9" dependencies = [ "arrayvec 0.5.1", "rustc-ap-rustc_macros", @@ -1062,18 +1084,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2706fc7106c75eaea49efe9f35f719a6fdfdb95212122ec2b543659406bae7ea" +checksum = "f69f83314702aaccf29c7401cc63bb0d9fa7869a185a23b8379f08c91514b3f3" dependencies = [ "unicode-xid", ] [[package]] name = "rustc-ap-rustc_lint_defs" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "493863f3a69509b0cd53f337215ed13a459dd3687c3782fc79f7f02ad021b8d2" +checksum = "3c1091fd1f947ef8abd4007a15b69b645faa3a315849c8f23e27f8a016315bea" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_data_structures", @@ -1086,9 +1108,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "288eaa669e90ebbe0d8343a4f7d09307acd68ed921c5627660f522970677a9da" +checksum = "5ba234f215056b1302f0c4d9b3c15356c6e1f44a3d7d19db73eae9e46c9a6d1f" dependencies = [ "proc-macro2", "quote", @@ -1098,9 +1120,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d76291d0a578f974e4ef4d31db587b35db6613b057cb18e5717ed8d0781a678" +checksum = "bcd8c97c698c7e979c816a087176ee4af1589293495d73fb72d47c3b6e93ffd7" dependencies = [ "bitflags", "rustc-ap-rustc_ast", @@ -1118,9 +1140,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_serialize" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8727f854a5ce1459c5b4fbd19b66e9a7cad81d7515374be8b5eb47f4ae799a9" +checksum = "20fe83d1149eb628c406c2165b9fb6e96cfd1654206f7ba3b1cde0b3538cda00" dependencies = [ "indexmap", "smallvec", @@ -1128,9 +1150,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1ef866957e601a40bdf4da70df294747384f66fda66a98bb92b4376668d44c1" +checksum = "35a1f89458c5d92d81f2ce32525d063a5534aacaa42894b8b5b029d9dc3062a6" dependencies = [ "bitflags", "getopts", @@ -1150,9 +1172,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_span" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c9af35a8e82b7445d5ce593bd93437aa3a93c97a34845c17395c85744531e82" +checksum = "9a25992110c91a9710725644b75bd2d4b232b9d9b6f8e55990004f8a9d4e9e9f" dependencies = [ "cfg-if 0.1.10", "md-5", @@ -1170,9 +1192,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "708.0.0" +version = "709.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d7984c64589b94ba3b192fc97b288ed8c5d549176f264ffe11774c27cecf3fd" +checksum = "fab561d3b1200351de581ddd9d33365eece730a0c80647b7c3827d18f812ea10" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", diff --git a/Cargo.toml b/Cargo.toml index 84e0f0b5806..26175a82cdd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" @@ -78,24 +78,24 @@ version = "708.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "708.0.0" +version = "709.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "708.0.0" +version = "709.0.0" From 3ed1eeee7507f4fc5b62b32f1f27b4cf8af0a171 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 14 Mar 2021 13:44:02 -0500 Subject: [PATCH 06/15] chore: apply AST HasAttrs->AstLike changes --- Cargo.lock | 1 - Cargo.toml | 6 +++--- src/attr.rs | 2 +- src/formatting.rs | 2 +- src/modules.rs | 4 ++-- src/visitor.rs | 2 +- 6 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fe1efb2ddf4..4d2b3eacb15 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1285,7 +1285,6 @@ dependencies = [ "regex", "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", - "rustc-ap-rustc_attr", "rustc-ap-rustc_data_structures", "rustc-ap-rustc_errors", "rustc-ap-rustc_expand", diff --git a/Cargo.toml b/Cargo.toml index 26175a82cdd..4f114e6afa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,9 +72,9 @@ version = "709.0.0" package = "rustc-ap-rustc_ast_pretty" version = "709.0.0" -[dependencies.rustc_attr] -package = "rustc-ap-rustc_attr" -version = "708.0.0" +# [dependencies.rustc_attr] +# package = "rustc-ap-rustc_attr" +# version = "708.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" diff --git a/src/attr.rs b/src/attr.rs index 2d25c263277..015e9f9b252 100644 --- a/src/attr.rs +++ b/src/attr.rs @@ -1,7 +1,7 @@ //! Format attributes and meta items. use rustc_ast::ast; -use rustc_ast::attr::HasAttrs; +use rustc_ast::AstLike; use rustc_span::{symbol::sym, Span, Symbol}; use self::doc_comment::DocCommentFormatter; diff --git a/src/formatting.rs b/src/formatting.rs index 2c38de04797..ce28f6bfea3 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::io::{self, Write}; use std::time::{Duration, Instant}; -use rustc_ast::ast; +use rustc_ast::{ast, AstLike}; use rustc_span::Span; use self::newline_style::apply_newline_style; diff --git a/src/modules.rs b/src/modules.rs index 2ee3639ffb1..feffd6e4a77 100644 --- a/src/modules.rs +++ b/src/modules.rs @@ -3,8 +3,8 @@ use std::collections::BTreeMap; use std::path::{Path, PathBuf}; use rustc_ast::ast; -use rustc_ast::attr::HasAttrs; use rustc_ast::visit::Visitor; +use rustc_ast::AstLike; use rustc_span::symbol::{self, sym, Symbol}; use rustc_span::Span; use thiserror::Error; @@ -54,7 +54,7 @@ impl<'a> Module<'a> { } } -impl<'a> HasAttrs for Module<'a> { +impl<'a> AstLike for Module<'a> { fn attrs(&self) -> &[ast::Attribute] { &self.inner_attr } diff --git a/src/visitor.rs b/src/visitor.rs index 4cd6b8d56d1..55cc9ec7f58 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -1,7 +1,7 @@ use std::cell::{Cell, RefCell}; use std::rc::Rc; -use rustc_ast::{ast, attr::HasAttrs, token::DelimToken, visit}; +use rustc_ast::{ast, token::DelimToken, visit, AstLike}; use rustc_span::{symbol, BytePos, Pos, Span, DUMMY_SP}; use crate::attr::*; From 91c1ce5e37e856b763d5ed1c68db8cdc97a2fc22 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Mon, 15 Mar 2021 20:04:09 -0500 Subject: [PATCH 07/15] deps: bump rustc-ap crates to v710 --- Cargo.lock | 80 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 16 +++++------ 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4d2b3eacb15..c1a3452ce95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -902,18 +902,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e5092e79ef393b11a2c0aa357445996010f2d4cd8b78f23353f4ba10fef9263" +checksum = "09cc69d5a1cbe5458fdf55ee464425999a23e0e38594affd878975c6d1161981" dependencies = [ "smallvec", ] [[package]] name = "rustc-ap-rustc_ast" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36b5265de3c7e3e811b568558cad58deb051567e96ed98cce825db9754ec08c" +checksum = "1670c64c84c3dee96a9af1d9a271f7779f6b8d08505812a251c97349a2c74fd1" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -928,9 +928,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_passes" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f938d487455271d339d8659a020173cba9c2adae49da02a38414e3d67951d538" +checksum = "46ff636e28b3ec07bb7181a97eb493dba55e871ca9c5fc53bdec3c34f07da8ae" dependencies = [ "itertools 0.9.0", "rustc-ap-rustc_ast", @@ -947,9 +947,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1341f5a50543daf575f28626a6928eac2cdd1edb92982c09aa61c8fd31755180" +checksum = "afbd9d272a6f291b91c34b6055598a47cd6b6d666cf3b0618b1bdaa20f1b615c" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_span", @@ -958,9 +958,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_attr" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69f5d82bc8c6e623d5724fe17b123d60ab0a6219ab62c38c66e05f52d5455b73" +checksum = "2cae34359d5799195c5bb91dcbe82becbd9b2976a92a46de75f3e071ed0062b2" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", @@ -976,9 +976,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_data_structures" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9358f2141b06ba67135d8c5069cb1eadf7f82dac150c035a382105e3f1eb5f" +checksum = "7675635707993b7ad122c5fd21af0e16a7be0253ffbe3d81e0be2674921b2b84" dependencies = [ "arrayvec 0.5.1", "bitflags", @@ -1007,9 +1007,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2739595a237062f3f671f4270c967e1b753c8b2f365dfc7c6832f69680341520" +checksum = "ebf4ff067d53db7e4154f4f5a7bc31eb2b5e90364339ad08154493a13f08f01f" dependencies = [ "annotate-snippets 0.8.0", "atty", @@ -1027,9 +1027,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f2b0742ca49b895efa3ce1cb88cee83680f256178f94c7e98686b47787ff85" +checksum = "d404fbaef1ead6c2cd5d2d4dcf578aff386732aee7c6da8e4a4504ba5fe21727" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", @@ -1051,9 +1051,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_feature" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80cfd636f98089b37eaf86706b03149a0ae28dad3394b6a01eb89b1a209d54d4" +checksum = "5f1808d6ade2805dafc41945dbfbac6441ab493800bafee1696a249b52b1304f" dependencies = [ "rustc-ap-rustc_data_structures", "rustc-ap-rustc_span", @@ -1061,21 +1061,21 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_fs_util" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088f185b74e6c6c008a2a600bb9c640c550626f5cab30192a60432478ae6a71e" +checksum = "695550e65e6fd3bfe52c5b7cace1c0805dabff670f3a3958592e4f8cbd2a2d09" [[package]] name = "rustc-ap-rustc_graphviz" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77819471ffc27b1688996badb18dada37da22428cbd53485c0a17cf552e6b64" +checksum = "acf3c5f83a7c955068de5588796349a2c94cecbe3abc9055fca950a3a10cb399" [[package]] name = "rustc-ap-rustc_index" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd66b37ab3adba14c4ee3e25a749f0a0b1aa47611027fff35f2c8f3ff5a687c9" +checksum = "10e3bf90c6c6ee3e0f7cd6bdfff785ae584a35179976bcf8b5f1e218e629cf3e" dependencies = [ "arrayvec 0.5.1", "rustc-ap-rustc_macros", @@ -1084,18 +1084,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f69f83314702aaccf29c7401cc63bb0d9fa7869a185a23b8379f08c91514b3f3" +checksum = "b0bba1ca6787b6d4af505b7a940eae9ecb084dd03e07f03bf3ddbf78e738b617" dependencies = [ "unicode-xid", ] [[package]] name = "rustc-ap-rustc_lint_defs" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c1091fd1f947ef8abd4007a15b69b645faa3a315849c8f23e27f8a016315bea" +checksum = "0796f811f124ee42a6f5d0a9bcaff03c08fc90a49a032573614a2d0ece0f9837" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_data_structures", @@ -1108,9 +1108,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ba234f215056b1302f0c4d9b3c15356c6e1f44a3d7d19db73eae9e46c9a6d1f" +checksum = "14e252035f6eddd9fec1f304024c4fa55d5641da67935074720fd44c0cd7766d" dependencies = [ "proc-macro2", "quote", @@ -1120,9 +1120,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcd8c97c698c7e979c816a087176ee4af1589293495d73fb72d47c3b6e93ffd7" +checksum = "d4f5a89463823107aad595ff6185df7081a94cb65841113f011323223cc14907" dependencies = [ "bitflags", "rustc-ap-rustc_ast", @@ -1140,9 +1140,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_serialize" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20fe83d1149eb628c406c2165b9fb6e96cfd1654206f7ba3b1cde0b3538cda00" +checksum = "ac99dcd4d58451bd0b71be4a765a25e9c10abfda0c5455dc68d200e84a3e1b3e" dependencies = [ "indexmap", "smallvec", @@ -1150,9 +1150,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35a1f89458c5d92d81f2ce32525d063a5534aacaa42894b8b5b029d9dc3062a6" +checksum = "e8d5d17eeec1bf007eb85bb5c1f1052ae54f04ce568bec9c448bd0fa0a68dbee" dependencies = [ "bitflags", "getopts", @@ -1172,9 +1172,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_span" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a25992110c91a9710725644b75bd2d4b232b9d9b6f8e55990004f8a9d4e9e9f" +checksum = "86c10a43704d020d017841a6bb9275d17491e2b62b3fac0d47a2412fde3f7cd6" dependencies = [ "cfg-if 0.1.10", "md-5", @@ -1192,9 +1192,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "709.0.0" +version = "710.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fab561d3b1200351de581ddd9d33365eece730a0c80647b7c3827d18f812ea10" +checksum = "5076254b1d7fd0c430a6ba95f29ac0459715343a6215216b98fb2e09bff80c1c" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", diff --git a/Cargo.toml b/Cargo.toml index 4f114e6afa4..142ecb67017 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "709.0.0" +version = "710.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "709.0.0" +version = "710.0.0" # [dependencies.rustc_attr] # package = "rustc-ap-rustc_attr" @@ -78,24 +78,24 @@ version = "709.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "709.0.0" +version = "710.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "709.0.0" +version = "710.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "709.0.0" +version = "710.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "709.0.0" +version = "710.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "709.0.0" +version = "710.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "709.0.0" +version = "710.0.0" From 0f7f2ec9caa0c444bd1f1bde28414689c6b726f3 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Mon, 15 Mar 2021 20:07:44 -0500 Subject: [PATCH 08/15] deps: apply rustc module loading changes --- src/formatting.rs | 2 +- src/modules.rs | 57 +++++++++++++++++++++++-------------------- src/syntux/parser.rs | 3 ++- src/syntux/session.rs | 10 ++------ 4 files changed, 35 insertions(+), 37 deletions(-) diff --git a/src/formatting.rs b/src/formatting.rs index ce28f6bfea3..caf24476e61 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -92,7 +92,7 @@ fn format_project( let mut context = FormatContext::new(&krate, report, parse_session, config, handler); let files = modules::ModResolver::new( &context.parse_session, - directory_ownership.unwrap_or(DirectoryOwnership::UnownedViaMod), + directory_ownership.unwrap_or(DirectoryOwnership::UnownedViaBlock), !input_is_stdin && !config.skip_children(), ) .visit_crate(&krate)?; diff --git a/src/modules.rs b/src/modules.rs index feffd6e4a77..ed4316974db 100644 --- a/src/modules.rs +++ b/src/modules.rs @@ -13,7 +13,7 @@ use crate::attr::MetaVisitor; use crate::config::FileName; use crate::items::is_mod_decl; use crate::syntux::parser::{ - Directory, DirectoryOwnership, ModulePathSuccess, Parser, ParserError, + Directory, DirectoryOwnership, ModError, ModulePathSuccess, Parser, ParserError, }; use crate::syntux::session::ParseSess; use crate::utils::contains_skip; @@ -61,6 +61,9 @@ impl<'a> AstLike for Module<'a> { fn visit_attrs(&mut self, f: impl FnOnce(&mut Vec)) { f(&mut self.inner_attr) } + fn tokens_mut(&mut self) -> Option<&mut Option> { + unimplemented!() + } } /// Maps each module to the corresponding file. @@ -331,7 +334,7 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { ) -> Result>, ModuleResolutionError> { let relative = match self.directory.ownership { DirectoryOwnership::Owned { relative } => relative, - DirectoryOwnership::UnownedViaBlock | DirectoryOwnership::UnownedViaMod => None, + DirectoryOwnership::UnownedViaBlock => None, }; if let Some(path) = Parser::submod_path_from_attr(attrs, &self.directory.path) { if self.parse_sess.is_file_parsed(&path) { @@ -366,31 +369,32 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { match self .parse_sess .default_submod_path(mod_name, relative, &self.directory.path) - .result { Ok(ModulePathSuccess { - path, ownership, .. + file_path, + dir_ownership, + .. }) => { let outside_mods_empty = mods_outside_ast.is_empty(); let should_insert = !mods_outside_ast .iter() - .any(|(outside_path, _, _)| outside_path == &path); - if self.parse_sess.is_file_parsed(&path) { + .any(|(outside_path, _, _)| outside_path == &file_path); + if self.parse_sess.is_file_parsed(&file_path) { if outside_mods_empty { return Ok(None); } else { if should_insert { - mods_outside_ast.push((path, ownership, sub_mod.clone())); + mods_outside_ast.push((file_path, dir_ownership, sub_mod.clone())); } return Ok(Some(SubModKind::MultiExternal(mods_outside_ast))); } } - match Parser::parse_file_as_module(self.parse_sess, &path, sub_mod.span) { + match Parser::parse_file_as_module(self.parse_sess, &file_path, sub_mod.span) { Ok((ref attrs, _, _)) if contains_skip(attrs) => Ok(None), Ok((attrs, items, span)) if outside_mods_empty => { Ok(Some(SubModKind::External( - path, - ownership, + file_path, + dir_ownership, Module::new( span, Some(Cow::Owned(ast::ModKind::Unloaded)), @@ -401,8 +405,8 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { } Ok((attrs, items, span)) => { mods_outside_ast.push(( - path.clone(), - ownership, + file_path.clone(), + dir_ownership, Module::new( span, Some(Cow::Owned(ast::ModKind::Unloaded)), @@ -411,39 +415,38 @@ impl<'ast, 'sess, 'c> ModResolver<'ast, 'sess> { ), )); if should_insert { - mods_outside_ast.push((path, ownership, sub_mod.clone())); + mods_outside_ast.push((file_path, dir_ownership, sub_mod.clone())); } Ok(Some(SubModKind::MultiExternal(mods_outside_ast))) } Err(ParserError::ParseError) => Err(ModuleResolutionError { module: mod_name.to_string(), - kind: ModuleResolutionErrorKind::ParseError { file: path }, + kind: ModuleResolutionErrorKind::ParseError { file: file_path }, }), Err(..) if outside_mods_empty => Err(ModuleResolutionError { module: mod_name.to_string(), - kind: ModuleResolutionErrorKind::NotFound { file: path }, + kind: ModuleResolutionErrorKind::NotFound { file: file_path }, }), Err(..) => { if should_insert { - mods_outside_ast.push((path, ownership, sub_mod.clone())); + mods_outside_ast.push((file_path, dir_ownership, sub_mod.clone())); } Ok(Some(SubModKind::MultiExternal(mods_outside_ast))) } } } - Err(mut e) if !mods_outside_ast.is_empty() => { - e.cancel(); + Err(mod_err) if !mods_outside_ast.is_empty() => { + if let ModError::ParserError(mut e) = mod_err { + e.cancel(); + } Ok(Some(SubModKind::MultiExternal(mods_outside_ast))) } - Err(mut e) => { - e.cancel(); - Err(ModuleResolutionError { - module: mod_name.to_string(), - kind: ModuleResolutionErrorKind::NotFound { - file: self.directory.path.clone(), - }, - }) - } + Err(_) => Err(ModuleResolutionError { + module: mod_name.to_string(), + kind: ModuleResolutionErrorKind::NotFound { + file: self.directory.path.clone(), + }, + }), } } diff --git a/src/syntux/parser.rs b/src/syntux/parser.rs index 29248ced2ff..0b94749f3c6 100644 --- a/src/syntux/parser.rs +++ b/src/syntux/parser.rs @@ -14,8 +14,9 @@ use crate::attr::first_attr_value_str_by_name; use crate::syntux::session::ParseSess; use crate::Input; -pub(crate) type DirectoryOwnership = rustc_expand::module::DirectoryOwnership; +pub(crate) type DirectoryOwnership = rustc_expand::module::DirOwnership; pub(crate) type ModulePathSuccess = rustc_expand::module::ModulePathSuccess; +pub(crate) type ModError<'a> = rustc_expand::module::ModError<'a>; #[derive(Clone)] pub(crate) struct Directory { diff --git a/src/syntux/session.rs b/src/syntux/session.rs index ef5ad62674e..374d08f7f23 100644 --- a/src/syntux/session.rs +++ b/src/syntux/session.rs @@ -150,14 +150,8 @@ impl ParseSess { id: symbol::Ident, relative: Option, dir_path: &Path, - ) -> rustc_expand::module::ModulePath<'_> { - rustc_expand::module::default_submod_path( - &self.parse_sess, - id, - rustc_span::DUMMY_SP, - relative, - dir_path, - ) + ) -> Result> { + rustc_expand::module::default_submod_path(&self.parse_sess, id, relative, dir_path) } pub(crate) fn is_file_parsed(&self, path: &Path) -> bool { From ae15523b03fbd9a9888b9abe0d5321cccb668592 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Tue, 16 Mar 2021 19:48:38 -0500 Subject: [PATCH 09/15] deps: bump rustc-ap crates to v711 --- Cargo.lock | 127 +++++++++++++++++++++++++++++------------------------ Cargo.toml | 16 +++---- 2 files changed, 77 insertions(+), 66 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c1a3452ce95..18fce1c5d4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -251,42 +251,46 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" +checksum = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" dependencies = [ "crossbeam-epoch", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.7.0", + "maybe-uninit", ] [[package]] name = "crossbeam-epoch" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "arrayvec 0.4.12", + "autocfg 1.0.1", "cfg-if 0.1.10", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.7.0", "lazy_static", + "maybe-uninit", "memoffset", "scopeguard", ] [[package]] name = "crossbeam-queue" -version = "0.1.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" +checksum = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" dependencies = [ - "crossbeam-utils 0.6.5", + "cfg-if 0.1.10", + "crossbeam-utils 0.7.0", + "maybe-uninit", ] [[package]] name = "crossbeam-utils" -version = "0.6.5" +version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" +checksum = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" dependencies = [ "cfg-if 0.1.10", "lazy_static", @@ -585,6 +589,12 @@ dependencies = [ "cfg-if 0.1.10", ] +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" + [[package]] name = "md-5" version = "0.9.1" @@ -897,23 +907,24 @@ checksum = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" dependencies = [ "base64", "blake2b_simd", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.6.6", ] [[package]] name = "rustc-ap-rustc_arena" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc69d5a1cbe5458fdf55ee464425999a23e0e38594affd878975c6d1161981" +checksum = "53c050d4265f6e524fa318fb80a7cb328a696fb242ee5f7a16fd811f6e486774" dependencies = [ + "rustc-ap-rustc_data_structures", "smallvec", ] [[package]] name = "rustc-ap-rustc_ast" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1670c64c84c3dee96a9af1d9a271f7779f6b8d08505812a251c97349a2c74fd1" +checksum = "739160ba3e81f157f838f7121f647a2183b218f422e16ca1b3f7c2e02c1487fb" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -928,9 +939,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_passes" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46ff636e28b3ec07bb7181a97eb493dba55e871ca9c5fc53bdec3c34f07da8ae" +checksum = "919e3dbdef36cae901744675cc96a5cd2700a4086b91ca4254e5e49988231726" dependencies = [ "itertools 0.9.0", "rustc-ap-rustc_ast", @@ -947,9 +958,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afbd9d272a6f291b91c34b6055598a47cd6b6d666cf3b0618b1bdaa20f1b615c" +checksum = "529e08e8d3defcdd372f5c1e2b83291720e93925090a863c85e6d377c1e4d730" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_span", @@ -958,9 +969,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_attr" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cae34359d5799195c5bb91dcbe82becbd9b2976a92a46de75f3e071ed0062b2" +checksum = "234b02185a27eedbff98dbfe6a3258fb6294efe4613c1c8613788a030324d7ad" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", @@ -976,9 +987,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_data_structures" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7675635707993b7ad122c5fd21af0e16a7be0253ffbe3d81e0be2674921b2b84" +checksum = "a3d784a5f78393493f3bb85f9598cb4259b86097e0ca97bb2abfd7caaf91dcb4" dependencies = [ "arrayvec 0.5.1", "bitflags", @@ -1007,9 +1018,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebf4ff067d53db7e4154f4f5a7bc31eb2b5e90364339ad08154493a13f08f01f" +checksum = "802694bfa5e71310c6e3a1e9aa0f2b2a7fe5e4802899a91d8546cd205a124b98" dependencies = [ "annotate-snippets 0.8.0", "atty", @@ -1027,9 +1038,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d404fbaef1ead6c2cd5d2d4dcf578aff386732aee7c6da8e4a4504ba5fe21727" +checksum = "266c14d813a3c895d715edda4c64f8819fbcae2d5bd1be948c7cc8244f5d4073" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", @@ -1051,9 +1062,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_feature" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f1808d6ade2805dafc41945dbfbac6441ab493800bafee1696a249b52b1304f" +checksum = "2e3a4b848e0dd6a5549c3379d547947a22fc160e83605c303d4e4f5f62709d8a" dependencies = [ "rustc-ap-rustc_data_structures", "rustc-ap-rustc_span", @@ -1061,21 +1072,21 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_fs_util" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695550e65e6fd3bfe52c5b7cace1c0805dabff670f3a3958592e4f8cbd2a2d09" +checksum = "6026674a2afffc5602f39ef30e3d3014377c0c4be70001934a0a25b71a19e826" [[package]] name = "rustc-ap-rustc_graphviz" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acf3c5f83a7c955068de5588796349a2c94cecbe3abc9055fca950a3a10cb399" +checksum = "db7ccfe86463304dbc073babd0290a0bfa3a375c2a1f7d93ba51a6129ede5864" [[package]] name = "rustc-ap-rustc_index" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e3bf90c6c6ee3e0f7cd6bdfff785ae584a35179976bcf8b5f1e218e629cf3e" +checksum = "fe42f0017edecc6521c33a05f791e89fe218ad591f7ce5a7bc9d961a1d50129a" dependencies = [ "arrayvec 0.5.1", "rustc-ap-rustc_macros", @@ -1084,18 +1095,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0bba1ca6787b6d4af505b7a940eae9ecb084dd03e07f03bf3ddbf78e738b617" +checksum = "a32efffdb17504a11ced7bba5538ae2452ea1eef9ad48f3b63c336477352da8c" dependencies = [ "unicode-xid", ] [[package]] name = "rustc-ap-rustc_lint_defs" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0796f811f124ee42a6f5d0a9bcaff03c08fc90a49a032573614a2d0ece0f9837" +checksum = "0d983646feff12bb72cef5172ca78a8a8c034a8e0f220d6913dcaea7d65f0f63" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_data_structures", @@ -1108,9 +1119,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14e252035f6eddd9fec1f304024c4fa55d5641da67935074720fd44c0cd7766d" +checksum = "88c08a1ab3aef2cd8574a9f305fb2266596a505041537fcc35b036681003b0d1" dependencies = [ "proc-macro2", "quote", @@ -1120,9 +1131,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4f5a89463823107aad595ff6185df7081a94cb65841113f011323223cc14907" +checksum = "533043a957c22f57ac6b707faa3514db143cfa459e00ad41139a1b9c099ed2fd" dependencies = [ "bitflags", "rustc-ap-rustc_ast", @@ -1140,9 +1151,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_serialize" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac99dcd4d58451bd0b71be4a765a25e9c10abfda0c5455dc68d200e84a3e1b3e" +checksum = "28c2e430449dbed703192cff1ec44ec731c1be53c8fbaae335a01f7dbb630dc2" dependencies = [ "indexmap", "smallvec", @@ -1150,9 +1161,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d17eeec1bf007eb85bb5c1f1052ae54f04ce568bec9c448bd0fa0a68dbee" +checksum = "2e22ecc4aee1c5afcf0733f90965dd0af873e9fa4a09106e623565bb0e8803a1" dependencies = [ "bitflags", "getopts", @@ -1172,9 +1183,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_span" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86c10a43704d020d017841a6bb9275d17491e2b62b3fac0d47a2412fde3f7cd6" +checksum = "1540067b114af3697b316dd83942e19d6e1295df35abde6ab569c60ec95d55a9" dependencies = [ "cfg-if 0.1.10", "md-5", @@ -1192,9 +1203,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "710.0.0" +version = "711.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5076254b1d7fd0c430a6ba95f29ac0459715343a6215216b98fb2e09bff80c1c" +checksum = "0a58b6d668ea0da42dc5f93a2b38ccfd884fcb278ed880e3523b7077c5dadf7c" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -1219,9 +1230,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc-rayon" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a" +checksum = "ed7d6a39f8bfd4421ce720918234d1e672b83824c91345b47c93746839cf1629" dependencies = [ "crossbeam-deque", "either", @@ -1230,13 +1241,13 @@ dependencies = [ [[package]] name = "rustc-rayon-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2427831f0053ea3ea73559c8eabd893133a51b251d142bacee53c62a288cb3" +checksum = "e94187d9ea3e8c38fafdbc38acb94eafa7ce155867f6ccb13830466a0d0db8c6" dependencies = [ "crossbeam-deque", "crossbeam-queue", - "crossbeam-utils 0.6.5", + "crossbeam-utils 0.7.0", "lazy_static", "num_cpus", ] diff --git a/Cargo.toml b/Cargo.toml index 142ecb67017..5f0aa4be630 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "710.0.0" +version = "711.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "710.0.0" +version = "711.0.0" # [dependencies.rustc_attr] # package = "rustc-ap-rustc_attr" @@ -78,24 +78,24 @@ version = "710.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "710.0.0" +version = "711.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "710.0.0" +version = "711.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "710.0.0" +version = "711.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "710.0.0" +version = "711.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "710.0.0" +version = "711.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "710.0.0" +version = "711.0.0" From fd3813f9477770104f6c0780dada53a73f4120d9 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Wed, 17 Mar 2021 17:09:41 -0500 Subject: [PATCH 10/15] chore: bump toolchain --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 09ed3829370..30b68df597c 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-02-06 +nightly-2021-03-16 From 1402e0c591cee53567f387797f281ece189dac27 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 28 Mar 2021 17:02:34 -0500 Subject: [PATCH 11/15] deps: remove unused rustc_attr crate AP crate --- Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5f0aa4be630..dfb2b0ad54d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -72,10 +72,6 @@ version = "711.0.0" package = "rustc-ap-rustc_ast_pretty" version = "711.0.0" -# [dependencies.rustc_attr] -# package = "rustc-ap-rustc_attr" -# version = "708.0.0" - [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" version = "711.0.0" From 61c6132925a76aa06a7b1ed67c4a86c114aacf51 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 27 Mar 2021 12:17:09 -0500 Subject: [PATCH 12/15] chore: bump rustc-ap crates to v712 --- Cargo.lock | 80 +++++++++++++++++++++++++++--------------------------- Cargo.toml | 16 +++++------ 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 18fce1c5d4f..9da9d1914dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -912,9 +912,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53c050d4265f6e524fa318fb80a7cb328a696fb242ee5f7a16fd811f6e486774" +checksum = "259cca0e975ecb05fd289ace45280c30ff792efc04e856a7f18b7fc86a3cb610" dependencies = [ "rustc-ap-rustc_data_structures", "smallvec", @@ -922,9 +922,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "739160ba3e81f157f838f7121f647a2183b218f422e16ca1b3f7c2e02c1487fb" +checksum = "bb9be435d50c88e94bbad6ea468c8680b52c5043bb298ab8058d05251717f8f8" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -939,9 +939,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_passes" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "919e3dbdef36cae901744675cc96a5cd2700a4086b91ca4254e5e49988231726" +checksum = "75246dd1a95a57f7767e53bde3971baa2d948078e180564709f5ea46cf863ddd" dependencies = [ "itertools 0.9.0", "rustc-ap-rustc_ast", @@ -958,9 +958,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "529e08e8d3defcdd372f5c1e2b83291720e93925090a863c85e6d377c1e4d730" +checksum = "79bede0b44bed453fd0034b7ba492840391f6486bf3e17a1af12922f0b98d4cc" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_span", @@ -969,9 +969,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_attr" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234b02185a27eedbff98dbfe6a3258fb6294efe4613c1c8613788a030324d7ad" +checksum = "84a92a4a34b996694ca2dab70361c60d2d48c07adce57e8155b7ec75e069e3ea" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", @@ -987,9 +987,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_data_structures" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3d784a5f78393493f3bb85f9598cb4259b86097e0ca97bb2abfd7caaf91dcb4" +checksum = "9cbfa7f82517a1b2efe7106c864c3f930b1da8aff07a27fd317af2f36522fd2e" dependencies = [ "arrayvec 0.5.1", "bitflags", @@ -1018,9 +1018,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "802694bfa5e71310c6e3a1e9aa0f2b2a7fe5e4802899a91d8546cd205a124b98" +checksum = "58a272a5101843bcb40900cc9ccf80ecfec62830bb1f4a242986da4a34c0da89" dependencies = [ "annotate-snippets 0.8.0", "atty", @@ -1038,9 +1038,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266c14d813a3c895d715edda4c64f8819fbcae2d5bd1be948c7cc8244f5d4073" +checksum = "3bc7988f3facf2402fe057405ef0f7fbacc7e7a483da25e35a35ac09491fbbfb" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", @@ -1062,9 +1062,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_feature" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3a4b848e0dd6a5549c3379d547947a22fc160e83605c303d4e4f5f62709d8a" +checksum = "5e931cd1580ae60c5737d3fa57633034935e885414e794d83b3e52a81021985c" dependencies = [ "rustc-ap-rustc_data_structures", "rustc-ap-rustc_span", @@ -1072,21 +1072,21 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_fs_util" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6026674a2afffc5602f39ef30e3d3014377c0c4be70001934a0a25b71a19e826" +checksum = "8fe9422e10d5b441d2a78202667bc85d7cf713a087b9ae6cdea0dfc825d79f07" [[package]] name = "rustc-ap-rustc_graphviz" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7ccfe86463304dbc073babd0290a0bfa3a375c2a1f7d93ba51a6129ede5864" +checksum = "ffffffdef9fd51db69c1d4c045ced8aaab999be5627f2d3a0ce020d74c1f1e50" [[package]] name = "rustc-ap-rustc_index" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe42f0017edecc6521c33a05f791e89fe218ad591f7ce5a7bc9d961a1d50129a" +checksum = "7f6f53afc4f7111c82295cb7ea3878f520bbac6a2c5a12e125b4ca9156498cff" dependencies = [ "arrayvec 0.5.1", "rustc-ap-rustc_macros", @@ -1095,18 +1095,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a32efffdb17504a11ced7bba5538ae2452ea1eef9ad48f3b63c336477352da8c" +checksum = "8056b05346dff7e39164d0434c6ec443a14ab5fbf6221bd1a56e5abbeae5f60c" dependencies = [ "unicode-xid", ] [[package]] name = "rustc-ap-rustc_lint_defs" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d983646feff12bb72cef5172ca78a8a8c034a8e0f220d6913dcaea7d65f0f63" +checksum = "364c3fb7b3cbdfe3fbb21d4078ff2cb3c58df63cda27995f8b064d21ee6dede5" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_data_structures", @@ -1119,9 +1119,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88c08a1ab3aef2cd8574a9f305fb2266596a505041537fcc35b036681003b0d1" +checksum = "4607d6879cae3bae4d0369ca4b3a7510fd6295ac32eec088ac975208ba96ca45" dependencies = [ "proc-macro2", "quote", @@ -1131,9 +1131,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533043a957c22f57ac6b707faa3514db143cfa459e00ad41139a1b9c099ed2fd" +checksum = "78d22889bff7ca2346037c9df7ea55c66ffb714f5b50fb62b41975f8ac7a2d70" dependencies = [ "bitflags", "rustc-ap-rustc_ast", @@ -1151,9 +1151,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_serialize" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c2e430449dbed703192cff1ec44ec731c1be53c8fbaae335a01f7dbb630dc2" +checksum = "d33c710120953c0214f47a6caf42064d7e241003b4af36c98a6d6156e70335f1" dependencies = [ "indexmap", "smallvec", @@ -1161,9 +1161,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e22ecc4aee1c5afcf0733f90965dd0af873e9fa4a09106e623565bb0e8803a1" +checksum = "6d35919041429a90713c8f704fa5209ba159cb554ce74d95722cbc18ac4b4c6f" dependencies = [ "bitflags", "getopts", @@ -1183,9 +1183,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_span" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1540067b114af3697b316dd83942e19d6e1295df35abde6ab569c60ec95d55a9" +checksum = "73b12170c69603c0bf4b50e5c25fd348aae13b8c6465aa0ef4389c9eaa568e51" dependencies = [ "cfg-if 0.1.10", "md-5", @@ -1203,9 +1203,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "711.0.0" +version = "712.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a58b6d668ea0da42dc5f93a2b38ccfd884fcb278ed880e3523b7077c5dadf7c" +checksum = "0a8329d92e7dc24b974f759e6c6e97e2bbc47b18d0573343028f8135ca367200" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", diff --git a/Cargo.toml b/Cargo.toml index dfb2b0ad54d..858f3f97288 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,32 +66,32 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "711.0.0" +version = "712.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "711.0.0" +version = "712.0.0" From f2eee71f981204adeb7141172a3af335b36cfeac Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 27 Mar 2021 12:19:05 -0500 Subject: [PATCH 13/15] deps: apply rustc-ap-* v712 changes --- src/expr.rs | 29 ++++++++++++++++------------- src/items.rs | 12 ++++++------ src/overflow.rs | 8 ++++---- src/patterns.rs | 6 +++--- src/spanned.rs | 4 ++-- src/vertical.rs | 4 ++-- 6 files changed, 33 insertions(+), 30 deletions(-) diff --git a/src/expr.rs b/src/expr.rs index 4589b57dacb..1befea9c805 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -106,15 +106,18 @@ pub(crate) fn format_expr( }) } ast::ExprKind::Unary(op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape), - ast::ExprKind::Struct(ref path, ref fields, ref struct_rest) => rewrite_struct_lit( - context, - path, - fields, - struct_rest, - &expr.attrs, - expr.span, - shape, - ), + ast::ExprKind::Struct(ref struct_expr) => { + let ast::StructExpr { ref fields, ref path, ref rest } = **struct_expr; + rewrite_struct_lit( + context, + path, + fields, + rest, + &expr.attrs, + expr.span, + shape, + ) + } ast::ExprKind::Tup(ref items) => { rewrite_tuple(context, items.iter(), expr.span, shape, items.len() == 1) } @@ -1496,14 +1499,14 @@ fn rewrite_index( } } -fn struct_lit_can_be_aligned(fields: &[ast::Field], has_base: bool) -> bool { +fn struct_lit_can_be_aligned(fields: &[ast::ExprField], has_base: bool) -> bool { !has_base && fields.iter().all(|field| !field.is_shorthand) } fn rewrite_struct_lit<'a>( context: &RewriteContext<'_>, path: &ast::Path, - fields: &'a [ast::Field], + fields: &'a [ast::ExprField], struct_rest: &ast::StructRest, attrs: &[ast::Attribute], span: Span, @@ -1512,7 +1515,7 @@ fn rewrite_struct_lit<'a>( debug!("rewrite_struct_lit: shape {:?}", shape); enum StructLitField<'a> { - Regular(&'a ast::Field), + Regular(&'a ast::ExprField), Base(&'a ast::Expr), Rest(&'a Span), } @@ -1668,7 +1671,7 @@ pub(crate) fn struct_lit_field_separator(config: &Config) -> &str { pub(crate) fn rewrite_field( context: &RewriteContext<'_>, - field: &ast::Field, + field: &ast::ExprField, shape: Shape, prefix_max_width: usize, ) -> Option { diff --git a/src/items.rs b/src/items.rs index 00757210ce5..61b49911e76 100644 --- a/src/items.rs +++ b/src/items.rs @@ -158,7 +158,7 @@ impl<'a> Item<'a> { #[derive(Debug)] enum BodyElement<'a> { // Stmt(&'a ast::Stmt), - // Field(&'a ast::Field), + // Field(&'a ast::ExprField), // Variant(&'a ast::Variant), // Item(&'a ast::Item), ForeignItem(&'a ast::ForeignItem), @@ -1274,7 +1274,7 @@ fn format_unit_struct( pub(crate) fn format_struct_struct( context: &RewriteContext<'_>, struct_parts: &StructParts<'_>, - fields: &[ast::StructField], + fields: &[ast::FieldDef], offset: Indent, one_line_width: Option, ) -> Option { @@ -1411,7 +1411,7 @@ fn format_empty_struct_or_tuple( fn format_tuple_struct( context: &RewriteContext<'_>, struct_parts: &StructParts<'_>, - fields: &[ast::StructField], + fields: &[ast::FieldDef], offset: Indent, ) -> Option { let mut result = String::with_capacity(1024); @@ -1631,7 +1631,7 @@ fn type_annotation_spacing(config: &Config) -> (&str, &str) { pub(crate) fn rewrite_struct_field_prefix( context: &RewriteContext<'_>, - field: &ast::StructField, + field: &ast::FieldDef, ) -> Option { let vis = format_visibility(context, &field.vis); let type_annotation_spacing = type_annotation_spacing(context.config); @@ -1646,7 +1646,7 @@ pub(crate) fn rewrite_struct_field_prefix( }) } -impl Rewrite for ast::StructField { +impl Rewrite for ast::FieldDef { fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option { rewrite_struct_field(context, self, shape, 0) } @@ -1654,7 +1654,7 @@ impl Rewrite for ast::StructField { pub(crate) fn rewrite_struct_field( context: &RewriteContext<'_>, - field: &ast::StructField, + field: &ast::FieldDef, shape: Shape, lhs_max_width: usize, ) -> Option { diff --git a/src/overflow.rs b/src/overflow.rs index 566f0e36639..f1b870101e5 100644 --- a/src/overflow.rs +++ b/src/overflow.rs @@ -74,7 +74,7 @@ pub(crate) enum OverflowableItem<'a> { MacroArg(&'a MacroArg), NestedMetaItem(&'a ast::NestedMetaItem), SegmentParam(&'a SegmentParam<'a>), - StructField(&'a ast::StructField), + FieldDef(&'a ast::FieldDef), TuplePatField(&'a TuplePatField<'a>), Ty(&'a ast::Ty), } @@ -96,7 +96,7 @@ impl<'a> OverflowableItem<'a> { match self { OverflowableItem::Expr(ast::Expr { attrs, .. }) | OverflowableItem::GenericParam(ast::GenericParam { attrs, .. }) => !attrs.is_empty(), - OverflowableItem::StructField(ast::StructField { attrs, .. }) => !attrs.is_empty(), + OverflowableItem::FieldDef(ast::FieldDef { attrs, .. }) => !attrs.is_empty(), OverflowableItem::MacroArg(MacroArg::Expr(expr)) => !expr.attrs.is_empty(), OverflowableItem::MacroArg(MacroArg::Item(item)) => !item.attrs.is_empty(), _ => false, @@ -113,7 +113,7 @@ impl<'a> OverflowableItem<'a> { OverflowableItem::MacroArg(macro_arg) => f(*macro_arg), OverflowableItem::NestedMetaItem(nmi) => f(*nmi), OverflowableItem::SegmentParam(sp) => f(*sp), - OverflowableItem::StructField(sf) => f(*sf), + OverflowableItem::FieldDef(sf) => f(*sf), OverflowableItem::TuplePatField(pat) => f(*pat), OverflowableItem::Ty(ty) => f(*ty), } @@ -238,7 +238,7 @@ macro_rules! impl_into_overflowable_item_for_rustfmt_types { } } -impl_into_overflowable_item_for_ast_node!(Expr, GenericParam, NestedMetaItem, StructField, Ty); +impl_into_overflowable_item_for_ast_node!(Expr, GenericParam, NestedMetaItem, FieldDef, Ty); impl_into_overflowable_item_for_rustfmt_types!([MacroArg], [SegmentParam, TuplePatField]); pub(crate) fn into_overflowable_list<'a, T>( diff --git a/src/patterns.rs b/src/patterns.rs index f9a9388e4ab..5d43d169d60 100644 --- a/src/patterns.rs +++ b/src/patterns.rs @@ -1,4 +1,4 @@ -use rustc_ast::ast::{self, BindingMode, FieldPat, Pat, PatKind, RangeEnd, RangeSyntax}; +use rustc_ast::ast::{self, BindingMode, PatField, Pat, PatKind, RangeEnd, RangeSyntax}; use rustc_ast::ptr; use rustc_span::{BytePos, Span}; @@ -259,7 +259,7 @@ impl Rewrite for Pat { fn rewrite_struct_pat( path: &ast::Path, - fields: &[ast::FieldPat], + fields: &[ast::PatField], ellipsis: bool, span: Span, context: &RewriteContext<'_>, @@ -334,7 +334,7 @@ fn rewrite_struct_pat( Some(format!("{} {{{}}}", path_str, fields_str)) } -impl Rewrite for FieldPat { +impl Rewrite for PatField { fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option { let hi_pos = if let Some(last) = self.attrs.last() { last.span.hi() diff --git a/src/spanned.rs b/src/spanned.rs index 1f6d0023e68..7e3786b7cd9 100644 --- a/src/spanned.rs +++ b/src/spanned.rs @@ -53,7 +53,7 @@ macro_rules! implement_spanned { // Implement `Spanned` for structs with `attrs` field. implement_spanned!(ast::AssocItem); implement_spanned!(ast::Expr); -implement_spanned!(ast::Field); +implement_spanned!(ast::ExprField); implement_spanned!(ast::ForeignItem); implement_spanned!(ast::Item); implement_spanned!(ast::Local); @@ -143,7 +143,7 @@ impl Spanned for ast::GenericParam { } } -impl Spanned for ast::StructField { +impl Spanned for ast::FieldDef { fn span(&self) -> Span { span_with_attrs_lo_hi!(self, self.span.lo(), self.ty.span.hi()) } diff --git a/src/vertical.rs b/src/vertical.rs index 95d1d5c2d7e..c4208848c6c 100644 --- a/src/vertical.rs +++ b/src/vertical.rs @@ -33,7 +33,7 @@ pub(crate) trait AlignedItem { ) -> Option; } -impl AlignedItem for ast::StructField { +impl AlignedItem for ast::FieldDef { fn skip(&self) -> bool { contains_skip(&self.attrs) } @@ -72,7 +72,7 @@ impl AlignedItem for ast::StructField { } } -impl AlignedItem for ast::Field { +impl AlignedItem for ast::ExprField { fn skip(&self) -> bool { contains_skip(&self.attrs) } From 5414bd30f035c276329868c4285450c6c20c329a Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sun, 28 Mar 2021 17:30:53 -0500 Subject: [PATCH 14/15] chore: fmt and cleanup --- src/expr.rs | 12 ++---------- src/formatting.rs | 2 +- src/patterns.rs | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/expr.rs b/src/expr.rs index 1befea9c805..d3fd22653b4 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -107,16 +107,8 @@ pub(crate) fn format_expr( } ast::ExprKind::Unary(op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape), ast::ExprKind::Struct(ref struct_expr) => { - let ast::StructExpr { ref fields, ref path, ref rest } = **struct_expr; - rewrite_struct_lit( - context, - path, - fields, - rest, - &expr.attrs, - expr.span, - shape, - ) + let ast::StructExpr { fields, path, rest } = &**struct_expr; + rewrite_struct_lit(context, path, fields, rest, &expr.attrs, expr.span, shape) } ast::ExprKind::Tup(ref items) => { rewrite_tuple(context, items.iter(), expr.span, shape, items.len() == 1) diff --git a/src/formatting.rs b/src/formatting.rs index caf24476e61..b69ecdc5cb8 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -4,7 +4,7 @@ use std::collections::HashMap; use std::io::{self, Write}; use std::time::{Duration, Instant}; -use rustc_ast::{ast, AstLike}; +use rustc_ast::ast; use rustc_span::Span; use self::newline_style::apply_newline_style; diff --git a/src/patterns.rs b/src/patterns.rs index 5d43d169d60..6824fc661ba 100644 --- a/src/patterns.rs +++ b/src/patterns.rs @@ -1,4 +1,4 @@ -use rustc_ast::ast::{self, BindingMode, PatField, Pat, PatKind, RangeEnd, RangeSyntax}; +use rustc_ast::ast::{self, BindingMode, Pat, PatField, PatKind, RangeEnd, RangeSyntax}; use rustc_ast::ptr; use rustc_span::{BytePos, Span}; From 7cf06c7beb8a3f516d26dd8e7d479f4bae162f92 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 27 Mar 2021 12:57:58 -0500 Subject: [PATCH 15/15] chore: bump toolchain --- rust-toolchain | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain b/rust-toolchain index 30b68df597c..0cb2de6a3fb 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2021-03-16 +nightly-2021-03-26