summaryrefslogtreecommitdiffstats
path: root/src/tools/rustfmt/tests
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:19:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-17 12:19:03 +0000
commit64d98f8ee037282c35007b64c2649055c56af1db (patch)
tree5492bcf97fce41ee1c0b1cc2add283f3e66cdab0 /src/tools/rustfmt/tests
parentAdding debian version 1.67.1+dfsg1-1. (diff)
downloadrustc-64d98f8ee037282c35007b64c2649055c56af1db.tar.xz
rustc-64d98f8ee037282c35007b64c2649055c56af1db.zip
Merging upstream version 1.68.2+dfsg1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/tools/rustfmt/tests')
-rw-r--r--src/tools/rustfmt/tests/source/issue-2445.rs4
-rw-r--r--src/tools/rustfmt/tests/target/issue-2445.rs4
-rw-r--r--src/tools/rustfmt/tests/target/issue_4110.rs1
3 files changed, 5 insertions, 4 deletions
diff --git a/src/tools/rustfmt/tests/source/issue-2445.rs b/src/tools/rustfmt/tests/source/issue-2445.rs
index 84ce6e647..deef429db 100644
--- a/src/tools/rustfmt/tests/source/issue-2445.rs
+++ b/src/tools/rustfmt/tests/source/issue-2445.rs
@@ -1,6 +1,6 @@
test!(RunPassPretty {
// comment
- path: "src/test/run-pass/pretty",
+ path: "tests/run-pass/pretty",
mode: "pretty",
suite: "run-pass",
default: false,
@@ -9,7 +9,7 @@ test!(RunPassPretty {
test!(RunPassPretty {
// comment
- path: "src/test/run-pass/pretty",
+ path: "tests/run-pass/pretty",
mode: "pretty",
suite: "run-pass",
default: false,
diff --git a/src/tools/rustfmt/tests/target/issue-2445.rs b/src/tools/rustfmt/tests/target/issue-2445.rs
index 1bc7752fd..463c5d495 100644
--- a/src/tools/rustfmt/tests/target/issue-2445.rs
+++ b/src/tools/rustfmt/tests/target/issue-2445.rs
@@ -1,6 +1,6 @@
test!(RunPassPretty {
// comment
- path: "src/test/run-pass/pretty",
+ path: "tests/run-pass/pretty",
mode: "pretty",
suite: "run-pass",
default: false,
@@ -9,7 +9,7 @@ test!(RunPassPretty {
test!(RunPassPretty {
// comment
- path: "src/test/run-pass/pretty",
+ path: "tests/run-pass/pretty",
mode: "pretty",
suite: "run-pass",
default: false,
diff --git a/src/tools/rustfmt/tests/target/issue_4110.rs b/src/tools/rustfmt/tests/target/issue_4110.rs
index 4a58c3946..d3734e90b 100644
--- a/src/tools/rustfmt/tests/target/issue_4110.rs
+++ b/src/tools/rustfmt/tests/target/issue_4110.rs
@@ -20,6 +20,7 @@ fn bindings() {
category,
span,
&format!("`{}`", name),
+ "function",
),
(
ref name,