From 50f05f2ab6cfd540b890e94f73765abc4c304a0e Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Fri, 20 Nov 2020 19:06:23 -0600 Subject: [PATCH 1/7] deps: bump rustc-ap to v687 --- Cargo.lock | 92 ++++++++++++++++++++++++++++++--------------------- Cargo.toml | 16 ++++----- src/macros.rs | 6 ++-- 3 files changed, 64 insertions(+), 50 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 134fd08fbe5..d61421eb66d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -889,18 +889,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "477085eefed2f12085c68577cc3827c8c39a31a4a750978aacb9af10f7903174" +checksum = "d9548efd0207ba77afed061282bfc77dce9ffc4f416fa8cefcdea45412e7077b" dependencies = [ "smallvec", ] [[package]] name = "rustc-ap-rustc_ast" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4ad5ec25f6b3d122354595be0d1b513f37fca3299d9b448b1db28f4a9e4b12" +checksum = "253544514f2396fb2f496c447318ebe5c5b2f9063a8513a98dc5688fd06a42ef" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -915,9 +915,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_passes" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6d8635298d7736decdb3c6e92e784d3eccde557462a9c10ac11a34fec3d756" +checksum = "024fb10af71ff71c99f3a55e10ffdb2530012928296e1c348c656e982dbb4e64" dependencies = [ "itertools 0.9.0", "rustc-ap-rustc_ast", @@ -934,9 +934,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a61bdb5252e1a95b7715038949e10f07ce770a436fcd497cdd9bc7255471de9" +checksum = "c4dee265aca1ab9be8aace2da5a61eda9d78ff40058c83a0e5b6730bc9e761f9" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_span", @@ -946,9 +946,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_attr" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84520a16cb61bd31e9c27e87eca5d933a9c94ac84f25649bddcc19989275ab2a" +checksum = "d23bc65cb684abc717e4c098413d20e421af066507ee1b6f2b9321898d6ce777" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", @@ -965,9 +965,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_data_structures" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cb2b6a38759cf7c0c1434c8b4cbfcab9cd24970d05f960f2ca01226ddb4d68" +checksum = "4927c77def1139bab23e23c6b6ebfa701a2dcbaf13729edbe6d802f61c5621c4" dependencies = [ "arrayvec 0.5.1", "bitflags", @@ -996,13 +996,14 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46cfb19536426bf9252827a78552d635be207a4be74f4e92832aad82d7f2135c" +checksum = "bd9d2bfa60d9829dcb3db7e6885e22a21d6a76f7a5a46b06466aa14802a33c89" 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", @@ -1015,9 +1016,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6273e60042a0ef31f6cfe783c519873993eb426f055be2bc058a48b6ca3934d0" +checksum = "e87c0700c0dca2ac330689bdcf38c74948df83abd1b36f23e4202995753b2857" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", @@ -1038,9 +1039,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_feature" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2936e8346157e2848305e509f38aa3ed4e97697975ef68027587f5db6a38703f" +checksum = "aa77d05cc28c00ed1962a4d0798e377494cb0794e18b851b7fdaac7a6bf4a69c" dependencies = [ "rustc-ap-rustc_data_structures", "rustc-ap-rustc_span", @@ -1048,21 +1049,21 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_fs_util" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b4c3ae17776b5a5aa441ca510a650f75805e1f5569edd231caa8378552195a4" +checksum = "27cb1b1962503abdf9d1b384ed6c96312f5f5cc74c1765c13e38abc8cf87a0f3" [[package]] name = "rustc-ap-rustc_graphviz" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5611bf0ac0ac49c2a22c959c7d8b17f85f69959293f0e8c4f753eca832fe7ad0" +checksum = "2e3f43c9b6e397f1872340ff480b3f5061197816d63f5a6ca4f2c59f75a407eb" [[package]] name = "rustc-ap-rustc_index" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca67cf37c427057192e451c7f912e94ae9a8ca5ad69fd481c011fad3f86982cb" +checksum = "a2c695641f0e1f101511a489af5dab8f5bd7e491555928530bc74612a04d751d" dependencies = [ "arrayvec 0.5.1", "rustc-ap-rustc_macros", @@ -1071,18 +1072,32 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b04cd2159495584d976d501c5394498470c2e94e4f0cebb8186562d407a678" +checksum = "14dfb7a447eb4b54302c64cb28edd1c8a903876d58078ee3efed3e9e5388bebe" dependencies = [ "unicode-xid", ] +[[package]] +name = "rustc-ap-rustc_lint_defs" +version = "687.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59c169f74b94427a52ea2f13e2b141186dea96b2e02de22650728392b13bdb5a" +dependencies = [ + "rustc-ap-rustc_ast", + "rustc-ap-rustc_data_structures", + "rustc-ap-rustc_macros", + "rustc-ap-rustc_serialize", + "rustc-ap-rustc_span", + "tracing", +] + [[package]] name = "rustc-ap-rustc_macros" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61ec6d623853449acd3c65050d249d3674edab5f6e4d9f074c7bac183269f9c8" +checksum = "7184879bb46b49e5477c53974a9fdd059d640232b265e2d09d77ad1999794f44" dependencies = [ "proc-macro2", "quote", @@ -1092,9 +1107,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca524bafce4b04d2b49fee2d40b4b26c3ebab9f1a4f731fdf561f00617862f02" +checksum = "202817bd5ed002b34276948c990025e9257ff121cd550fdac4a111732539c6a9" dependencies = [ "bitflags", "rustc-ap-rustc_ast", @@ -1112,9 +1127,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_serialize" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c67920561e58f98c4de864407c92b2dd05ace5d5e5301e17444f10f742c005b7" +checksum = "5d62c5c9e6757d4ebf4f02789aebe79c75520b9692fa852c9d2d6fa30cb68cb3" dependencies = [ "indexmap", "smallvec", @@ -1122,9 +1137,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0762fd855792e06ef639327237898e4e092ad68150e6a8e19aeb7dc06276ad7a" +checksum = "b8faa9b0da728e081df58c344e2a4103148184680c25e8889c4d31954fa63514" dependencies = [ "bitflags", "getopts", @@ -1134,6 +1149,7 @@ dependencies = [ "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", @@ -1143,9 +1159,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_span" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf3db7b4ca5d21c14c45475df155e5e020c9a3760346945a662c9a9053b49c8" +checksum = "96519323a26751576fb739a6e6f65bf9a1dd1898f835bea288a7de27f31931a2" dependencies = [ "cfg-if", "md-5", @@ -1162,9 +1178,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "686.0.0" +version = "687.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa6560bb9742b276064d67ab9edb5766ecb303f8ae3854835ad3fad4b432188" +checksum = "b22730b097a9330120046d78e2da2c6bed2bf220cc3e2751f4c619f0702912bc" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", diff --git a/Cargo.toml b/Cargo.toml index 7d21b8df418..63c188a1c88 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 = "686.0.0" +version = "687.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "686.0.0" +version = "687.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" @@ -78,24 +78,24 @@ version = "686.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "686.0.0" +version = "687.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "686.0.0" +version = "687.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "686.0.0" +version = "687.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "686.0.0" +version = "687.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "686.0.0" +version = "687.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "686.0.0" +version = "687.0.0" diff --git a/src/macros.rs b/src/macros.rs index 3bff059984f..e5a28751988 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -13,9 +13,7 @@ use std::collections::HashMap; use std::panic::{catch_unwind, AssertUnwindSafe}; use rustc_ast::token::{BinOpToken, DelimToken, Token, TokenKind}; -use rustc_ast::tokenstream::{ - Cursor, LazyTokenStream, LazyTokenStreamInner, TokenStream, TokenTree, -}; +use rustc_ast::tokenstream::{Cursor, LazyTokenStream, TokenStream, TokenTree}; use rustc_ast::{ast, ptr}; use rustc_ast_pretty::pprust; use rustc_parse::parser::Parser; @@ -1214,7 +1212,7 @@ pub(crate) fn convert_try_mac( kind: ast::ExprKind::Try(parser.parse_expr().ok()?), span: mac.span(), // incorrect span, but shouldn't matter too much attrs: ast::AttrVec::new(), - tokens: Some(LazyTokenStream::new(LazyTokenStreamInner::Ready(ts))), + tokens: Some(LazyTokenStream::new(ts)), }) } else { None From 78d0965f4b41df2444464b8a570910c61924ff0e Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 28 Nov 2020 14:54:03 -0600 Subject: [PATCH 2/7] deps: bump rustc-ap crates to v691 --- Cargo.lock | 190 +++++++++++++++++++++++++++-------------------------- Cargo.toml | 18 ++--- 2 files changed, 106 insertions(+), 102 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d61421eb66d..f29b73235b8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -89,7 +89,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "924c76597f0d9ca25d762c25a4d369d51267536465dc5064bdf0eb073ed477ea" dependencies = [ "backtrace-sys", - "cfg-if", + "cfg-if 0.1.10", "libc", "rustc-demangle", ] @@ -132,25 +132,13 @@ dependencies = [ [[package]] name = "block-buffer" -version = "0.7.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" +checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "block-padding", - "byte-tools", - "byteorder", "generic-array", ] -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - [[package]] name = "bstr" version = "0.2.8" @@ -160,12 +148,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytecount" version = "0.6.0" @@ -205,6 +187,12 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "clap" version = "2.33.0" @@ -244,6 +232,12 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "995a44c877f9212528ccc74b21a232f66ad69001e40ede5bcee2ac9ef2657120" +[[package]] +name = "cpuid-bool" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" + [[package]] name = "crossbeam-channel" version = "0.4.0" @@ -270,7 +264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" dependencies = [ "arrayvec 0.4.12", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.6.5", "lazy_static", "memoffset", @@ -292,7 +286,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8306fcef4a7b563b76b7dd949ca48f52bc1141aa067d2ea09565f3e2652aa5c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -303,7 +297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce446db02cdc3165b94ae73111e570793400d0794e46125cc4056c81cbb039f4" dependencies = [ "autocfg 0.1.7", - "cfg-if", + "cfg-if 0.1.10", "lazy_static", ] @@ -326,9 +320,9 @@ checksum = "3c2b69f912779fbb121ceb775d74d51e915af17aaebc38d28a592843a2dd0a3a" [[package]] name = "digest" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ "generic-array", ] @@ -339,7 +333,7 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13aea89a5c93364a98e9b37b2fa237effbb694d5cfe01c5b70941f7eb087d5e3" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "dirs-sys", ] @@ -349,7 +343,7 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa0b23de8fd801745c471deffa6e12d248f962c9fd4b4c33787b055599bde7b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "redox_users", "winapi", @@ -405,12 +399,6 @@ dependencies = [ "synstructure", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fnv" version = "1.0.6" @@ -425,11 +413,12 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" [[package]] name = "generic-array" -version = "0.12.3" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" +checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" dependencies = [ "typenum", + "version_check", ] [[package]] @@ -447,7 +436,7 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "473a1265acc8ff1e808cd0a1af8cee3c2ee5200916058a2ca113c29f2d903571" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "wasi", ] @@ -526,7 +515,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -591,14 +580,14 @@ version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] name = "md-5" -version = "0.8.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18af3dcaf2b0219366cdb4e2af65a6101457b415c3d1a5c71dd9c2b7c77b9c8" +checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" dependencies = [ "block-buffer", "digest", @@ -648,9 +637,9 @@ dependencies = [ [[package]] name = "opaque-debug" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "packed_simd" @@ -658,7 +647,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a85ea9fc0d4ac0deb6fe7911d38786b32fc11119afd9e9d38b84ff691ce64220" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", ] [[package]] @@ -678,7 +667,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c361aa727dd08437f2f1447be8b59a33b0edd15e0fcee698f935613d9efbca9b" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "cloudabi 0.1.0", "instant", "libc", @@ -889,18 +878,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9548efd0207ba77afed061282bfc77dce9ffc4f416fa8cefcdea45412e7077b" +checksum = "81f7b9bc5a6f79b1f230833cb4c8f8928d48c129b21df5b372c202fb826c0b5e" dependencies = [ "smallvec", ] [[package]] name = "rustc-ap-rustc_ast" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "253544514f2396fb2f496c447318ebe5c5b2f9063a8513a98dc5688fd06a42ef" +checksum = "3d77f313e9f30af93f2737f1a99d6552e26b702c5cef3bb65e35f5b4fe5191f1" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -915,9 +904,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_passes" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "024fb10af71ff71c99f3a55e10ffdb2530012928296e1c348c656e982dbb4e64" +checksum = "30408fbf42fa6fbeb383d3fce0f24d2490c3d12527beb2f48e6e728765bc8695" dependencies = [ "itertools 0.9.0", "rustc-ap-rustc_ast", @@ -934,9 +923,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4dee265aca1ab9be8aace2da5a61eda9d78ff40058c83a0e5b6730bc9e761f9" +checksum = "d47b8a3adcccc204578b0ee9cd2f9952921fa43977f58343913cca04cce87043" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_span", @@ -946,9 +935,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_attr" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bc65cb684abc717e4c098413d20e421af066507ee1b6f2b9321898d6ce777" +checksum = "66f5f53ecdbf7d8b47905936f93eb1fdae496137e94b7e4023a0b866b0e1a92d" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_pretty", @@ -965,13 +954,13 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_data_structures" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4927c77def1139bab23e23c6b6ebfa701a2dcbaf13729edbe6d802f61c5621c4" +checksum = "3aa913fa40b90157067b17dd7ddfd5df0d8566e339ffa8351a638bdf3fc7ee81" dependencies = [ "arrayvec 0.5.1", "bitflags", - "cfg-if", + "cfg-if 0.1.10", "crossbeam-utils 0.7.0", "ena", "indexmap", @@ -996,9 +985,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9d2bfa60d9829dcb3db7e6885e22a21d6a76f7a5a46b06466aa14802a33c89" +checksum = "5d4b4956287d7c4996409b8362aa69c0c9a6853751ff00ee0a6f78223c5ef3ad" dependencies = [ "annotate-snippets 0.8.0", "atty", @@ -1016,9 +1005,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e87c0700c0dca2ac330689bdcf38c74948df83abd1b36f23e4202995753b2857" +checksum = "3fa908bb1b67230dd4309e93edefc6a6c2f3d8b6a195f77c47743c882114a22e" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_ast_passes", @@ -1039,9 +1028,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_feature" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa77d05cc28c00ed1962a4d0798e377494cb0794e18b851b7fdaac7a6bf4a69c" +checksum = "d9b7a1db115893ed7ed0db80f70d2246c1709de7854238acde76471495930f2a" dependencies = [ "rustc-ap-rustc_data_structures", "rustc-ap-rustc_span", @@ -1049,21 +1038,21 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_fs_util" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27cb1b1962503abdf9d1b384ed6c96312f5f5cc74c1765c13e38abc8cf87a0f3" +checksum = "55937887cb606cc72193ea3c5feb8bbbb810d812aa233b9a1e7749155c4a3501" [[package]] name = "rustc-ap-rustc_graphviz" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e3f43c9b6e397f1872340ff480b3f5061197816d63f5a6ca4f2c59f75a407eb" +checksum = "e39e179e616356927f0c4eda43e3a35d88476f91e1ac8e4a0a09661dbab44a6e" [[package]] name = "rustc-ap-rustc_index" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2c695641f0e1f101511a489af5dab8f5bd7e491555928530bc74612a04d751d" +checksum = "572d3962d6999f3b1a71d335308e939e204339d4ad36e6ebe7a591c9d4329f5d" dependencies = [ "arrayvec 0.5.1", "rustc-ap-rustc_macros", @@ -1072,18 +1061,18 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_lexer" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dfb7a447eb4b54302c64cb28edd1c8a903876d58078ee3efed3e9e5388bebe" +checksum = "44bc89d9ca7a78fb82e103b389362c55f03800745f8ba14e068b805cfaf783ec" dependencies = [ "unicode-xid", ] [[package]] name = "rustc-ap-rustc_lint_defs" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c169f74b94427a52ea2f13e2b141186dea96b2e02de22650728392b13bdb5a" +checksum = "7d39bda92aabd77e49ac8ad5e24fccf9d7245b8ff2bf1249ab98733e2e5a2863" dependencies = [ "rustc-ap-rustc_ast", "rustc-ap-rustc_data_structures", @@ -1095,9 +1084,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7184879bb46b49e5477c53974a9fdd059d640232b265e2d09d77ad1999794f44" +checksum = "a3295fbc9625197494e356e92d8ac08370eddafa60189861c7b2f084b3b5a6b8" dependencies = [ "proc-macro2", "quote", @@ -1107,9 +1096,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "202817bd5ed002b34276948c990025e9257ff121cd550fdac4a111732539c6a9" +checksum = "9ff5d0094396844efead43303a6eb25b8a4962e2c80fb0ea4a86e4101fbfd404" dependencies = [ "bitflags", "rustc-ap-rustc_ast", @@ -1127,9 +1116,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_serialize" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d62c5c9e6757d4ebf4f02789aebe79c75520b9692fa852c9d2d6fa30cb68cb3" +checksum = "2d5cff6709a8b51a3730288a9ead17cabe8146b1c787db52298447ef7890140a" dependencies = [ "indexmap", "smallvec", @@ -1137,9 +1126,9 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8faa9b0da728e081df58c344e2a4103148184680c25e8889c4d31954fa63514" +checksum = "36bb15ef12174b5ed6419a7e4260a899ce8927e8c8fd1f0cddf178818737dcdf" dependencies = [ "bitflags", "getopts", @@ -1159,11 +1148,11 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_span" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96519323a26751576fb739a6e6f65bf9a1dd1898f835bea288a7de27f31931a2" +checksum = "104d349a32be9cfd3d39a5a70ad6c5e682ce262fc5cc8717d35a01e980c0d8b2" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "md-5", "rustc-ap-rustc_arena", "rustc-ap-rustc_data_structures", @@ -1172,15 +1161,16 @@ dependencies = [ "rustc-ap-rustc_serialize", "scoped-tls", "sha-1", + "sha2", "tracing", "unicode-width", ] [[package]] name = "rustc-ap-rustc_target" -version = "687.0.0" +version = "691.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22730b097a9330120046d78e2da2c6bed2bf220cc3e2751f4c619f0702912bc" +checksum = "9d7ac4ded9a6aecb534744c836a160497985f0d53b272581e95e7890d31b9e17" dependencies = [ "bitflags", "rustc-ap-rustc_data_structures", @@ -1367,13 +1357,27 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.8.2" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce3cdf1b5e620a498ee6f2a171885ac7e22f0e12089ec4b3d22b84921792507c" +dependencies = [ + "block-buffer", + "cfg-if 1.0.0", + "cpuid-bool", + "digest", + "opaque-debug", +] + +[[package]] +name = "sha2" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +checksum = "6e7aab86fe2149bad8c507606bdb3f4ef5e7b2380eb92350f56122cca72a42a8" dependencies = [ "block-buffer", + "cfg-if 1.0.0", + "cpuid-bool", "digest", - "fake-simd", "opaque-debug", ] @@ -1396,7 +1400,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21ccb4c06ec57bc82d0f610f1a2963d7648700e43a6f513e564b9c89f7991786" dependencies = [ "cc", - "cfg-if", + "cfg-if 0.1.10", "libc", "psm", "winapi", @@ -1472,7 +1476,7 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "libc", "rand", "redox_syscall", @@ -1571,7 +1575,7 @@ version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d79ca061b032d6ce30c660fded31189ca0b9922bf483cd70759f13a2d86786c" dependencies = [ - "cfg-if", + "cfg-if 0.1.10", "tracing-attributes", "tracing-core", ] diff --git a/Cargo.toml b/Cargo.toml index 63c188a1c88..95f93be6be7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,36 +66,36 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" -version = "686.0.0" +version = "691.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "687.0.0" +version = "691.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "687.0.0" +version = "691.0.0" From 225b124a5112bf231f82715160a55a9e79c2b5dd Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 28 Nov 2020 14:58:10 -0600 Subject: [PATCH 3/7] deps: minor rustc_ast changes for v691 --- src/modules/visitor.rs | 2 +- src/skip.rs | 2 +- src/visitor.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/modules/visitor.rs b/src/modules/visitor.rs index 42d5351080d..d5acf3f1cbc 100644 --- a/src/modules/visitor.rs +++ b/src/modules/visitor.rs @@ -30,7 +30,7 @@ impl<'a> CfgIfVisitor<'a> { } impl<'a, 'ast: 'a> Visitor<'ast> for CfgIfVisitor<'a> { - fn visit_mac(&mut self, mac: &'ast ast::MacCall) { + fn visit_mac_call(&mut self, mac: &'ast ast::MacCall) { match self.visit_mac_inner(mac) { Ok(()) => (), Err(e) => debug!("{}", e), diff --git a/src/skip.rs b/src/skip.rs index fd48e67ee73..6c500635a95 100644 --- a/src/skip.rs +++ b/src/skip.rs @@ -58,7 +58,7 @@ fn get_skip_names(kind: &str, attrs: &[ast::Attribute]) -> Vec { for attr in attrs { // rustc_ast::ast::Path is implemented partialEq // but it is designed for segments.len() == 1 - if let ast::AttrKind::Normal(attr_item) = &attr.kind { + if let ast::AttrKind::Normal(attr_item, _) = &attr.kind { if pprust::path_to_string(&attr_item.path) != path { continue; } diff --git a/src/visitor.rs b/src/visitor.rs index a5f6ebfb67b..ecf72833195 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -851,7 +851,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { ); } else { match &attr.kind { - ast::AttrKind::Normal(ref attribute_item) + ast::AttrKind::Normal(ref attribute_item, _) if self.is_unknown_rustfmt_attr(&attribute_item.path.segments) => { let file_name = self.parse_sess.span_to_filename(attr.span); From 7b1fda6bf0cfb080161c73477cd94241fe5be2b4 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Fri, 27 Nov 2020 21:09:33 -0600 Subject: [PATCH 4/7] feat: support struct/slice destructuring --- src/expr.rs | 46 +++++++++++++++++++++++++---------------- tests/source/structs.rs | 11 ++++++++++ tests/target/structs.rs | 14 +++++++++++++ 3 files changed, 53 insertions(+), 18 deletions(-) diff --git a/src/expr.rs b/src/expr.rs index 1ba879ccc1d..38543b70ae3 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -106,11 +106,11 @@ 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 base) => rewrite_struct_lit( + ast::ExprKind::Struct(ref path, ref fields, ref struct_rest) => rewrite_struct_lit( context, path, fields, - base.as_ref().map(|e| &**e), + struct_rest, &expr.attrs, expr.span, shape, @@ -1510,19 +1510,15 @@ fn rewrite_index( } } -fn struct_lit_can_be_aligned(fields: &[ast::Field], base: Option<&ast::Expr>) -> bool { - if base.is_some() { - return false; - } - - fields.iter().all(|field| !field.is_shorthand) +fn struct_lit_can_be_aligned(fields: &[ast::Field], 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], - base: Option<&'a ast::Expr>, + struct_rest: &ast::StructRest, attrs: &[ast::Attribute], span: Span, shape: Shape, @@ -1532,22 +1528,29 @@ fn rewrite_struct_lit<'a>( enum StructLitField<'a> { Regular(&'a ast::Field), Base(&'a ast::Expr), + Rest(&'a Span), } // 2 = " {".len() let path_shape = shape.sub_width(2)?; let path_str = rewrite_path(context, PathContext::Expr, None, path, path_shape)?; - if fields.is_empty() && base.is_none() { - return Some(format!("{} {{}}", path_str)); - } + + let has_base = match struct_rest { + ast::StructRest::None if fields.is_empty() => return Some(format!("{} {{}}", path_str)), + ast::StructRest::Rest(_) if fields.is_empty() => { + return Some(format!("{} {{ .. }}", path_str)); + } + ast::StructRest::Base(_) => true, + _ => false, + }; // Foo { a: Foo } - indent is +3, width is -5. let (h_shape, v_shape) = struct_lit_shape(shape, context, path_str.len() + 3, 2)?; let one_line_width = h_shape.map_or(0, |shape| shape.width); let body_lo = context.snippet_provider.span_after(span, "{"); - let fields_str = if struct_lit_can_be_aligned(fields, base) + let fields_str = if struct_lit_can_be_aligned(fields, has_base) && context.config.struct_field_align_threshold() > 0 { rewrite_with_alignment( @@ -1558,10 +1561,14 @@ fn rewrite_struct_lit<'a>( one_line_width, )? } else { - let field_iter = fields - .iter() - .map(StructLitField::Regular) - .chain(base.into_iter().map(StructLitField::Base)); + let field_iter = fields.iter().map(StructLitField::Regular).chain( + match struct_rest { + ast::StructRest::Base(expr) => Some(StructLitField::Base(&**expr)), + ast::StructRest::Rest(span) => Some(StructLitField::Rest(span)), + ast::StructRest::None => None, + } + .into_iter(), + ); let span_lo = |item: &StructLitField<'_>| match *item { StructLitField::Regular(field) => field.span().lo(), @@ -1571,10 +1578,12 @@ fn rewrite_struct_lit<'a>( let pos = snippet.find_uncommented("..").unwrap(); last_field_hi + BytePos(pos as u32) } + StructLitField::Rest(span) => span.lo(), }; let span_hi = |item: &StructLitField<'_>| match *item { StructLitField::Regular(field) => field.span().hi(), StructLitField::Base(expr) => expr.span.hi(), + StructLitField::Rest(span) => span.hi(), }; let rewrite = |item: &StructLitField<'_>| match *item { StructLitField::Regular(field) => { @@ -1586,6 +1595,7 @@ fn rewrite_struct_lit<'a>( expr.rewrite(context, v_shape.offset_left(2)?) .map(|s| format!("..{}", s)) } + StructLitField::Rest(_) => Some("..".to_owned()), }; let items = itemize_list( @@ -1612,7 +1622,7 @@ fn rewrite_struct_lit<'a>( nested_shape, tactic, context, - force_no_trailing_comma || base.is_some() || !context.use_block_indent(), + force_no_trailing_comma || has_base || !context.use_block_indent(), ); write_list(&item_vec, &fmt)? diff --git a/tests/source/structs.rs b/tests/source/structs.rs index 711264a11d3..537151b276a 100644 --- a/tests/source/structs.rs +++ b/tests/source/structs.rs @@ -15,6 +15,17 @@ pub struct Foo { pub i: TypeForPublicField } +// Destructuring +fn foo() { + S { x: 5, + ..}; + Struct {..} = Struct { a: 1, b: 4 }; + Struct { a, .. } = Struct { a: 1, b: 2, c: 3}; + TupleStruct(a,.., b) = TupleStruct(1, 2); + TupleStruct( ..) = TupleStruct(3, 4); + TupleStruct(aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, .., bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb) = TupleStruct(1, 2); +} + // #1095 struct S { t: T, diff --git a/tests/target/structs.rs b/tests/target/structs.rs index 0495ab3c81c..4948e37a5a3 100644 --- a/tests/target/structs.rs +++ b/tests/target/structs.rs @@ -15,6 +15,20 @@ pub struct Foo { pub i: TypeForPublicField, } +// Destructuring +fn foo() { + S { x: 5, .. }; + Struct { .. } = Struct { a: 1, b: 4 }; + Struct { a, .. } = Struct { a: 1, b: 2, c: 3 }; + TupleStruct(a, .., b) = TupleStruct(1, 2); + TupleStruct(..) = TupleStruct(3, 4); + TupleStruct( + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa, + .., + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, + ) = TupleStruct(1, 2); +} + // #1095 struct S { t: T, From 08455dfdb954b719856987e6e521963dec98e70c Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Fri, 27 Nov 2020 21:30:27 -0600 Subject: [PATCH 5/7] refactor: update cfg_if attr parsing --- src/syntux/parser.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/syntux/parser.rs b/src/syntux/parser.rs index 3a72fb6be88..c8d427478dc 100644 --- a/src/syntux/parser.rs +++ b/src/syntux/parser.rs @@ -227,8 +227,16 @@ impl<'a> Parser<'a> { if !parser.eat_keyword(kw::If) { return Err("Expected `if`"); } + // Inner attributes are not actually syntactically permitted here, but we don't + // care about inner vs outer attributes in this position. Our purpose with this + // special case parsing of cfg_if macros is to ensure we can correctly resolve + // imported modules that may have a custom `path` defined. + // + // As such, we just need to advance the parser past the attribute and up to + // to the opening brace. + // See also https://github.com/rust-lang/rust/pull/79433 parser - .parse_attribute(false) + .parse_attribute(rustc_parse::parser::attr::InnerAttrPolicy::Permitted) .map_err(|_| "Failed to parse attributes")?; } From 403ed65fcdaa397ae71b0abe46108f42eb12306f Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Fri, 27 Nov 2020 21:18:39 -0600 Subject: [PATCH 6/7] feat: support underscore expressions --- src/expr.rs | 1 + src/utils.rs | 3 ++- tests/source/expr.rs | 10 ++++++++++ tests/target/expr.rs | 10 ++++++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/src/expr.rs b/src/expr.rs index 38543b70ae3..fe348bc6028 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -384,6 +384,7 @@ pub(crate) fn format_expr( } } ast::ExprKind::Await(_) => rewrite_chain(expr, context, shape), + ast::ExprKind::Underscore => Some("_".to_owned()), ast::ExprKind::Err => None, }; diff --git a/src/utils.rs b/src/utils.rs index 96d465608fa..bd419b2998b 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -504,7 +504,8 @@ pub(crate) fn is_block_expr(context: &RewriteContext<'_>, expr: &ast::Expr, repr | ast::ExprKind::Ret(..) | ast::ExprKind::Tup(..) | ast::ExprKind::Type(..) - | ast::ExprKind::Yield(None) => false, + | ast::ExprKind::Yield(None) + | ast::ExprKind::Underscore => false, } } diff --git a/tests/source/expr.rs b/tests/source/expr.rs index 8a6e6f1aa2b..21f8a4a4366 100644 --- a/tests/source/expr.rs +++ b/tests/source/expr.rs @@ -567,3 +567,13 @@ fn foo() { } .await; } + +fn underscore() { + _= 1; + _; + [ _,a,_ ] = [1, 2, 3]; + (a, _) = (8, 9); + TupleStruct( _, a) = TupleStruct(2, 2); + + let _ : usize = foo(_, _); +} diff --git a/tests/target/expr.rs b/tests/target/expr.rs index 5d9e972066c..84df802bc70 100644 --- a/tests/target/expr.rs +++ b/tests/target/expr.rs @@ -659,3 +659,13 @@ fn foo() { } .await; } + +fn underscore() { + _ = 1; + _; + [_, a, _] = [1, 2, 3]; + (a, _) = (8, 9); + TupleStruct(_, a) = TupleStruct(2, 2); + + let _: usize = foo(_, _); +} From 2fbcbf1f6b0a9268c7eec08dd51caba26b3fa261 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 28 Nov 2020 15:03:06 -0600 Subject: [PATCH 7/7] chore: run rustfmt against source --- src/expr.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/expr.rs b/src/expr.rs index fe348bc6028..71446ce1ab0 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -1536,7 +1536,6 @@ fn rewrite_struct_lit<'a>( let path_shape = shape.sub_width(2)?; let path_str = rewrite_path(context, PathContext::Expr, None, path, path_shape)?; - let has_base = match struct_rest { ast::StructRest::None if fields.is_empty() => return Some(format!("{} {{}}", path_str)), ast::StructRest::Rest(_) if fields.is_empty() => {