about summary refs log tree commit diff
path: root/src/tools/rustfmt/tests/source/issue-3278
diff options
context:
space:
mode:
authorYacin Tmimi <yacintmimi@gmail.com>2024-09-19 21:46:44 -0400
committerYacin Tmimi <yacintmimi@gmail.com>2024-09-19 21:46:44 -0400
commiteeda9dd07068121961ea4af111dd8060fe58e396 (patch)
tree91b1189c77a5b62b2b039b8260b681cd42c5cb26 /src/tools/rustfmt/tests/source/issue-3278
parent506f22b4663f3e756e1e6a4f66c6309fdc00819c (diff)
parentb23b69900eab1260be510b2bd8922f4b6de6cf1e (diff)
Merge commit 'b23b69900eab1260be510b2bd8922f4b6de6cf1e' into sync-from-rustfmt
Diffstat (limited to 'src/tools/rustfmt/tests/source/issue-3278')
-rw-r--r--src/tools/rustfmt/tests/source/issue-3278/version_one.rs2
-rw-r--r--src/tools/rustfmt/tests/source/issue-3278/version_two.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/rustfmt/tests/source/issue-3278/version_one.rs b/src/tools/rustfmt/tests/source/issue-3278/version_one.rs
index 580679fbae3..718a32b4c7e 100644
--- a/src/tools/rustfmt/tests/source/issue-3278/version_one.rs
+++ b/src/tools/rustfmt/tests/source/issue-3278/version_one.rs
@@ -1,4 +1,4 @@
-// rustfmt-version: One
+// rustfmt-style_edition: 2015
 
 pub fn parse_conditional<'a, I: 'a>(
 ) -> impl Parser<Input = I, Output = Expr, PartialState = ()> + 'a
diff --git a/src/tools/rustfmt/tests/source/issue-3278/version_two.rs b/src/tools/rustfmt/tests/source/issue-3278/version_two.rs
index c17b1742d39..eb605e509f9 100644
--- a/src/tools/rustfmt/tests/source/issue-3278/version_two.rs
+++ b/src/tools/rustfmt/tests/source/issue-3278/version_two.rs
@@ -1,4 +1,4 @@
-// rustfmt-version: Two
+// rustfmt-style_edition: 2024
 
 pub fn parse_conditional<'a, I: 'a>()
 -> impl Parser<Input = I, Output = Expr, PartialState = ()> + 'a