Skip to content

Commit 63bd8cf

Browse files
authored
Rollup merge of #154233 - kyleecodes:tests/reorg-ui-issues, r=Kivooeo
Move ui/issues tests to relevant subdirectories Related to #133895 and [Reorganisation of tests/ui/issues for GSOC](https://github.com/rust-lang/google-summer-of-code?tab=readme-ov-file#reorganisation-of-testsuiissues) This is the first PR in a batch of PRs. Moves `ui/issues/issue-17546.rs‎` ‎-> `ui/variants/variant-result-noresult-used-as-type.rs` Approach: 1. Check linked issue and test contents, determine new target directory 2. Move / rename tests to reflect purpose. 3. Add issue link / comments in separate commit. 4. Rebless if necessary and remove obsolete stderr. r? @Kivooeo
2 parents dc2c20e + 62ba3c1 commit 63bd8cf

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

tests/ui/issues/issue-17546.rs renamed to tests/ui/variants/variant-result-noresult-used-as-type.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
//@ edition:2015
22
//@ ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
3+
// https://github.com/rust-lang/rust/issues/17546
34

45
use foo::MyEnum::Result;
56
use foo::NoResult; // Through a re-export

tests/ui/issues/issue-17546.stderr renamed to tests/ui/variants/variant-result-noresult-used-as-type.stderr

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0573]: expected type, found variant `NoResult`
2-
--> $DIR/issue-17546.rs:15:17
2+
--> $DIR/variant-result-noresult-used-as-type.rs:16:17
33
|
44
LL | fn new() -> NoResult<MyEnum, String> {
55
| ^^^^^^^^^^^^^^^^^^^^^^^^
@@ -19,7 +19,7 @@ LL + fn new() -> Result<MyEnum, String> {
1919
|
2020

2121
error[E0573]: expected type, found variant `Result`
22-
--> $DIR/issue-17546.rs:25:17
22+
--> $DIR/variant-result-noresult-used-as-type.rs:26:17
2323
|
2424
LL | fn new() -> Result<foo::MyEnum, String> {
2525
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@@ -36,7 +36,7 @@ LL + use std::thread::Result;
3636
|
3737

3838
error[E0573]: expected type, found variant `Result`
39-
--> $DIR/issue-17546.rs:31:13
39+
--> $DIR/variant-result-noresult-used-as-type.rs:32:13
4040
|
4141
LL | fn new() -> Result<foo::MyEnum, String> {
4242
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^ not a type
@@ -53,7 +53,7 @@ LL + use std::thread::Result;
5353
|
5454

5555
error[E0573]: expected type, found variant `NoResult`
56-
--> $DIR/issue-17546.rs:36:15
56+
--> $DIR/variant-result-noresult-used-as-type.rs:37:15
5757
|
5858
LL | fn newer() -> NoResult<foo::MyEnum, String> {
5959
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)