mirror of
https://github.com/rust-lang/rust.git
synced 2026-04-27 18:57:42 +03:00
Rollup merge of #154233 - kyleecodes:tests/reorg-ui-issues, r=Kivooeo
Move ui/issues tests to relevant subdirectories Related to https://github.com/rust-lang/rust/issues/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
This commit is contained in:
+1
@@ -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
|
||||
+4
-4
@@ -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> {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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> {
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
Reference in New Issue
Block a user