-
Notifications
You must be signed in to change notification settings - Fork 14k
Tidying up UI tests [5/N] #149411
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.
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
base: main
Are you sure you want to change the base?
Tidying up UI tests [5/N] #149411
Conversation
There was a problem hiding this 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
| mod mod_file_disambig_aux; //~ ERROR file for module `mod_file_disambig_aux` found at both | ||
|
|
||
| fn main() {} |
There was a problem hiding this comment.
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`
}The assert_eq statement here seems unnecessary, so I removed it.
This comment has been minimized.
This comment has been minimized.
modules/mod_file_correct_spans.rs
modules/mod_file_disambig.rs add fix
typeck/qualified-path-params.rs merged test removed ui/qualified directory
|
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 |
|
Ah, I agree. then I won't squah this PR either. and in the next PR, I'll commit the move and change separately ! |
|
@bors r+ rollup |
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
Note
Intermediate commits are intended to help review, but will be squashed prior to merge.
part of #133895
merge directory
macro_backtrace->macrosmissing_non_modrs_mod->modulesmodules_and_files_visibility->modulesqualified->typeckwhile->for-loop-whlier? Kivooeo