From fca8c7b8fcd86bf932d5f261bd2a090b48d6c928 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Mon, 13 Mar 2023 21:42:50 -0700 Subject: [PATCH] Update test suite to nightly-2023-03-14 --- tests/common/eq.rs | 15 +++++++-------- tests/repo/mod.rs | 14 +++++++++++++- tests/test_precedence.rs | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/tests/common/eq.rs b/tests/common/eq.rs index dc2f1f2a64..70a533768c 100644 --- a/tests/common/eq.rs +++ b/tests/common/eq.rs @@ -574,14 +574,13 @@ spanless_eq_enum!(UseTreeKind; Simple(0) Nested(0) Glob); spanless_eq_enum!(VariantData; Struct(0 1) Tuple(0 1) Unit(0)); spanless_eq_enum!(VisibilityKind; Public Restricted(path id shorthand) Inherited); spanless_eq_enum!(WherePredicate; BoundPredicate(0) RegionPredicate(0) EqPredicate(0)); -spanless_eq_enum!(ExprKind; Box(0) Array(0) ConstBlock(0) Call(0 1) - MethodCall(0) Tup(0) Binary(0 1 2) Unary(0 1) Lit(0) Cast(0 1) Type(0 1) - Let(0 1 2) If(0 1 2) While(0 1 2) ForLoop(0 1 2 3) Loop(0 1 2) Match(0 1) - Closure(0) Block(0 1) Async(0 1 2) Await(0) TryBlock(0) Assign(0 1 2) - AssignOp(0 1 2) Field(0 1) Index(0 1) Underscore Range(0 1 2) Path(0 1) - AddrOf(0 1 2) Break(0 1) Continue(0) Ret(0) InlineAsm(0) MacCall(0) - Struct(0) Repeat(0 1) Paren(0) Try(0) Yield(0) Yeet(0) IncludedBytes(0) - FormatArgs(0) Err); +spanless_eq_enum!(ExprKind; Array(0) ConstBlock(0) Call(0 1) MethodCall(0) + Tup(0) Binary(0 1 2) Unary(0 1) Lit(0) Cast(0 1) Type(0 1) Let(0 1 2) + If(0 1 2) While(0 1 2) ForLoop(0 1 2 3) Loop(0 1 2) Match(0 1) Closure(0) + Block(0 1) Async(0 1 2) Await(0) TryBlock(0) Assign(0 1 2) AssignOp(0 1 2) + Field(0 1) Index(0 1) Underscore Range(0 1 2) Path(0 1) AddrOf(0 1 2) + Break(0 1) Continue(0) Ret(0) InlineAsm(0) MacCall(0) Struct(0) Repeat(0 1) + Paren(0) Try(0) Yield(0) Yeet(0) IncludedBytes(0) FormatArgs(0) Err); spanless_eq_enum!(InlineAsmOperand; In(reg expr) Out(reg late expr) InOut(reg late expr) SplitInOut(reg late in_expr out_expr) Const(anon_const) Sym(sym)); diff --git a/tests/repo/mod.rs b/tests/repo/mod.rs index 2b67125d48..123864c801 100644 --- a/tests/repo/mod.rs +++ b/tests/repo/mod.rs @@ -10,10 +10,22 @@ use std::path::Path; use tar::Archive; use walkdir::DirEntry; -const REVISION: &str = "afaf3e07aaa7ca9873bdb439caec53faffa4230c"; +const REVISION: &str = "22f247c6f3ed388cb702d01c2ff27da658a8b353"; #[rustfmt::skip] static EXCLUDE_FILES: &[&str] = &[ + // TODO + "src/tools/rust-analyzer/crates/parser/test_data/parser/inline/ok/0132_box_expr.rs", + "src/tools/rust-analyzer/crates/parser/test_data/parser/inline/ok/0132_box_expr.rs", + "src/tools/rust-analyzer/crates/parser/test_data/parser/inline/ok/0137_await_expr.rs", + "src/tools/rustfmt/tests/source/issue-4689/one.rs", + "src/tools/rustfmt/tests/source/issue-4689/two.rs", + "src/tools/rustfmt/tests/source/issue_1306.rs", + "src/tools/rustfmt/tests/target/issue-4689/one.rs", + "src/tools/rustfmt/tests/target/issue-4689/two.rs", + "src/tools/rustfmt/tests/target/issue_1306.rs", + "tests/ui/rfc-2632-const-trait-impl/const-closure-parse-not-item.rs", + // Compile-fail expr parameter in const generic position: f::<1 + 2>() "tests/ui/const-generics/early/closing-args-token.rs", "tests/ui/const-generics/early/const-expression-parameter.rs", diff --git a/tests/test_precedence.rs b/tests/test_precedence.rs index 409f2222cc..e2931ff5a8 100644 --- a/tests/test_precedence.rs +++ b/tests/test_precedence.rs @@ -228,7 +228,7 @@ fn librustc_brackets(mut librustc_expr: P) -> Option> { fn noop_visit_expr(e: &mut Expr, vis: &mut T) { use rustc_ast::mut_visit::{noop_visit_expr, visit_attrs}; match &mut e.kind { - ExprKind::AddrOf(BorrowKind::Raw, ..) | ExprKind::Box(..) => {} + ExprKind::AddrOf(BorrowKind::Raw, ..) => {} ExprKind::Struct(expr) => { let StructExpr { qself,