Skip to content

Conversation

@reddevilmidzy
Copy link
Member

Note

Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of #133895

r? Kivooeo

@rustbot
Copy link
Collaborator

rustbot commented Dec 21, 2025

This PR modifies tests/ui/issues/. If this PR is adding new tests to tests/ui/issues/,
please refrain from doing so, and instead add it to more descriptive subdirectories.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 21, 2025
Copy link
Member

Choose a reason for hiding this comment

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

That seems more of a label; I didn't found a place for a break. you can maybe search for the "break" keyword in tests/ui to find a better place

Copy link
Member Author

Choose a reason for hiding this comment

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

I thought it was similar to array-break-length.rs, so I made it array-break-length-2 and merged it here.
Would it be a good idea to move all array-break-length.rs to another directory?

Copy link
Member

Choose a reason for hiding this comment

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

I feel like, yeah, it seems reasonable to me to move both of them into some more related directory

Copy link
Member Author

Choose a reason for hiding this comment

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

A directory just for break and continue would probably be tests/ui/for-loop-while. But this test seems like it would be appropriate for tests/closures.

Merged with existing similar tests. https://github.com/rust-lang/rust/blob/main/tests/ui/closures/closure-array-break-length.rs

Copy link
Member

Choose a reason for hiding this comment

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

I feel like it's more about cast, and I believe I saw a directory for cast stuff somewhere before, maybe even in this PR

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah, I thought this test was similar to the existing tests/ui/mismatched_types/cast-rfc0401.rs test, so I placed it in the mismatched directory.

Now I moved them all to cast, and deleted the duplicate test, cast-rfc0401-2.rs!

Copy link
Member

Choose a reason for hiding this comment

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

cast-rfc0401.rs also should be in cast directory :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Oh, I guess I didn't explain it well enough.
Merge mismatched_types/cast-rfc0401-2.rs and mismatched_types/cast-rfc0401.rs and move to cast/cast-rfc0401-fail.rs

(cast/cast-rfc0401.rs aready exist for success case)

Copy link
Member

Choose a reason for hiding this comment

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

Well, it seems like both mismatched_types/cast-rfc0401.rs and cast/cast-rfc0401.rs already existing? So, if I understood it correctly, I think it would be reasonable to merge them

Copy link
Member Author

Choose a reason for hiding this comment

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

To recap, there are currently no tests for rfc0401 in the mismatched_types directory, and there used to be a cast/cast-rfc0401.rs test for the success case.

And I merged the three tests below into cast/cast-rfc0401-fail.rs:

Ultimately, the success cases are in cast/cast-rfc0401.rs and the failure cases are in cast/cast-rfc0401-fail.rs.

@Kivooeo
Copy link
Member

Kivooeo commented Dec 22, 2025

Thanks for taking time on this!

@Kivooeo Kivooeo added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 22, 2025
@reddevilmidzy
Copy link
Member Author

Thanks for the review:)
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 23, 2025
@reddevilmidzy
Copy link
Member Author

force-push after each reflection seems a bit more confusing.
Next time, I think it would be better to clean up commits before the final merge and avoid force-push intermediate reflections.

@Kivooeo
Copy link
Member

Kivooeo commented Dec 23, 2025

Looks good, seems like it's ready to be squased

add comment to closure-move-use-after-move-diagnostic.rs

add comment to missing-operator-after-float.rs

add comment to closure-array-break-length.rs

add comment to box-lifetime-argument-not-allowed.rs

add comment to const-return-outside-fn.rs

add comment to drop-conflicting-impls.rs

add comment to unbalanced-doublequote-2.rs

add comment to borrow-immutable-deref-box.rs

add comment to for-in-const-eval.rs

add comment to borrowck-annotated-static-lifetime.rs

cleaned up cast-rfc0401.rs

add comment to nll-anon-to-static.rs

add comment to cast-to-dyn-any.rs

add comment to missing-associated-items.rs

add comment to enum-discriminant-missing-variant.rs
@Kivooeo
Copy link
Member

Kivooeo commented Dec 23, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Dec 23, 2025

📌 Commit 4578082 has been approved by Kivooeo

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 23, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 23, 2025
Tidying up tests/ui/issues 15 tests [6/N]

> [!NOTE]
> Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of rust-lang#133895

r? Kivooeo
bors added a commit that referenced this pull request Dec 23, 2025
Rollup of 5 pull requests

Successful merges:

 - #150182 (Don't export upstream monomorphizations from compiler-builtins)
 - #150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - #150308 (Update bors configuration)
 - #150311 (Avoid using env::temp when linking a binary)
 - #150314 (rustc-dev-guide subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit that referenced this pull request Dec 24, 2025
Rollup of 6 pull requests

Successful merges:

 - #149800 (Fix ICE in normalization during closure capture analysis (#149746))
 - #150182 (Don't export upstream monomorphizations from compiler-builtins)
 - #150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - #150308 (Update bors configuration)
 - #150314 (rustc-dev-guide subtree update)
 - #150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit b6c2dab into rust-lang:main Dec 24, 2025
11 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 24, 2025
rust-timer added a commit that referenced this pull request Dec 24, 2025
Rollup merge of #150216 - reddevilmidzy:t13, r=Kivooeo

Tidying up tests/ui/issues 15 tests [6/N]

> [!NOTE]
> Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of #133895

r? Kivooeo
@reddevilmidzy reddevilmidzy deleted the t13 branch December 24, 2025 06:23
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 27, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#149800 (Fix ICE in normalization during closure capture analysis (rust-lang/rust#149746))
 - rust-lang/rust#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang/rust#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang/rust#150308 (Update bors configuration)
 - rust-lang/rust#150314 (rustc-dev-guide subtree update)
 - rust-lang/rust#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
github-actions bot pushed a commit to rust-lang/rustc-dev-guide that referenced this pull request Dec 29, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#149800 (Fix ICE in normalization during closure capture analysis (rust-lang/rust#149746))
 - rust-lang/rust#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang/rust#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang/rust#150308 (Update bors configuration)
 - rust-lang/rust#150314 (rustc-dev-guide subtree update)
 - rust-lang/rust#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
Kobzol pushed a commit to Kobzol/rustc_codegen_cranelift that referenced this pull request Dec 29, 2025
Rollup of 6 pull requests

Successful merges:

 - rust-lang/rust#149800 (Fix ICE in normalization during closure capture analysis (rust-lang/rust#149746))
 - rust-lang/rust#150182 (Don't export upstream monomorphizations from compiler-builtins)
 - rust-lang/rust#150216 (Tidying up tests/ui/issues 15 tests [6/N])
 - rust-lang/rust#150308 (Update bors configuration)
 - rust-lang/rust#150314 (rustc-dev-guide subtree update)
 - rust-lang/rust#150319 (use new term in description of --target)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants