Skip to content

Conversation

@reddevilmidzy
Copy link
Contributor

Note

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

part of #133895

merge directory

  • macro_backtrace -> macros
  • missing_non_modrs_mod -> modules
  • modules_and_files_visibility -> modules
  • qualified -> typeck
  • while -> for-loop-whlie

r? Kivooeo

@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 Nov 28, 2025
Copy link
Contributor Author

@reddevilmidzy reddevilmidzy left a comment

Choose a reason for hiding this comment

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

There was a typo in the commit message, I'll fix it when I squash!

Relocate modules_ans_files_visibity/mod_file_correct_spans.rs to modules/mod_file_correct_spans.rs

View changes since this review

mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both

fn main() {}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

original

mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both

fn main() {
    assert_eq!(mod_file_aux::bar(), 10);
    //~^ ERROR failed to resolve: use of unresolved module or unlinked crate `mod_file_aux`
}

a74d92e

The assert_eq statement here seems unnecessary, so I removed it.

@rust-log-analyzer

This comment has been minimized.

@Kivooeo
Copy link
Member

Kivooeo commented Nov 28, 2025

For context, we had a discussion earlier this year about test squashing. We decided against squashing and instead to split moves and changes into separate commits to preserve the git history of test files

Here's the process: First, you create a commit with just the file moves (no changes of it's content). Then, you make separate commits for the changes to each file. After the review, you squash all the commits that modified files (i.e., all commits except the first one with the plain moves)

This approach also improves the review experience

That said, for this particular PR, feel free to squash all the commits into one

@reddevilmidzy
Copy link
Contributor Author

Ah, I agree. then I won't squah this PR either. and in the next PR, I'll commit the move and change separately !

@Kivooeo
Copy link
Member

Kivooeo commented Nov 28, 2025

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Nov 28, 2025

📌 Commit ace4aeb 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 Nov 28, 2025
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 28, 2025
Tidying up UI tests [5/N]

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

part of rust-lang#133895

merge directory

* `macro_backtrace` -> `macros`
* `missing_non_modrs_mod` -> `modules`
* `modules_and_files_visibility` -> `modules`
* `qualified` -> `typeck`
* `while` -> `for-loop-whlie`

r? Kivooeo
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.

5 participants