From cb8d9c45a43561fb563ab52392c1714dbb9c51c2 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 19 Jan 2022 16:08:09 -0800 Subject: [PATCH 1/2] Advance test suite past the let-chains PR --- tests/repo/mod.rs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs index 57fc7d8a33..35fd25733c 100644 --- a/tests/repo/mod.rs +++ b/tests/repo/mod.rs @@ -10,10 +10,20 @@ use std::path::Path; use tar::Archive; use walkdir::DirEntry; -const REVISION: &str = "e100ec5bc7cd768ec17d75448b29c9ab4a39272b"; +const REVISION: &str = "5e57faa78aa7661c6000204591558f6665f11abc"; #[rustfmt::skip] static EXCLUDE: &[&str] = &[ + // TODO + "src/test/ui/expr/if/attrs/let-chains-attr.rs", + "src/test/ui/mir/mir_let_chains_drop_order.rs", + "src/test/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs", + "src/test/ui/rfc-2497-if-let-chains/irrefutable-lets.rs", + "src/test/ui/rfc-2497-if-let-chains/issue-90722.rs", + "src/test/ui/rfc-2497-if-let-chains/then-else-blocks.rs", + "src/tools/rustfmt/tests/source/async_block.rs", + "src/tools/rustfmt/tests/target/async_block.rs", + // TODO: impl ~const T {} // https://github.com/dtolnay/syn/issues/1051 "src/test/ui/rfc-2632-const-trait-impl/syntax.rs", From 2d96ccd74db8d5f3deb6bd5f7f9c7e92de83bb59 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 19 Jan 2022 16:30:54 -0800 Subject: [PATCH 2/2] Categorize most recent group of upstream's tests --- tests/repo/mod.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs index 35fd25733c..16ff09f32a 100644 --- a/tests/repo/mod.rs +++ b/tests/repo/mod.rs @@ -14,13 +14,15 @@ const REVISION: &str = "5e57faa78aa7661c6000204591558f6665f11abc"; #[rustfmt::skip] static EXCLUDE: &[&str] = &[ - // TODO + // TODO: let chains "src/test/ui/expr/if/attrs/let-chains-attr.rs", "src/test/ui/mir/mir_let_chains_drop_order.rs", "src/test/ui/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs", "src/test/ui/rfc-2497-if-let-chains/irrefutable-lets.rs", "src/test/ui/rfc-2497-if-let-chains/issue-90722.rs", "src/test/ui/rfc-2497-if-let-chains/then-else-blocks.rs", + + // TODO: static async closure keyword order "src/tools/rustfmt/tests/source/async_block.rs", "src/tools/rustfmt/tests/target/async_block.rs",