Skip to content

Move ui/issues tests to relevant subdirectories #154233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rust-bors merged 1 commit into from
Mar 25, 2026
+5 −4
Merged

Move ui/issues tests to relevant subdirectories #154233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/ui/issues/issue-17546.rs → ...s/variant-result-noresult-used-as-type.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//@ edition:2015
//@ ignore-sgx std::os::fortanix_sgx::usercalls::raw::Result changes compiler suggestions
// https://github.com/rust-lang/rust/issues/17546

use foo::MyEnum::Result;
use foo::NoResult; // Through a re-export
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/issues/issue-17546.stderr → ...riant-result-noresult-used-as-type.stderr
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@zedddie zedddie Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey! you don't need to bless in the first (move) commit, since you'll rebless anyway after adding metadata in the next one (and the move commit should only consist of moves.) . It makes less noise in the diff if you just move first, then bless + add metadata together.

Copy link
Copy Markdown
Contributor Author

@kyleecodes kyleecodes Mar 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, with issue links updating stderr line numbers. I'll update my approach to separate the move, then commit rebless with metadata / code changes.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0573]: expected type, found variant `NoResult`
--> $DIR/issue-17546.rs:15:17
--> $DIR/variant-result-noresult-used-as-type.rs:16:17
|
LL | fn new() -> NoResult<MyEnum, String> {
| ^^^^^^^^^^^^^^^^^^^^^^^^
Expand All @@ -19,7 +19,7 @@ LL + fn new() -> Result<MyEnum, String> {
|

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

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

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