Conversation
|
|
||
| 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.
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 |
Rollup of 6 pull requests Successful merges: - #147952 (Add a timeout to the `remote-test-client` connection) - #149321 (Fix ICE when include_str! reads binary files) - #149398 (add regression test for issue #143987) - #149411 (Tidying up UI tests [5/N]) - #149413 (add test for issue 143821) - #149415 (Remove test-float-parse from workspace list in tidy) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 6 pull requests Successful merges: - #147952 (Add a timeout to the `remote-test-client` connection) - #149321 (Fix ICE when include_str! reads binary files) - #149398 (add regression test for issue #143987) - #149411 (Tidying up UI tests [5/N]) - #149413 (add test for issue 143821) - #149415 (Remove test-float-parse from workspace list in tidy) r? `@ghost` `@rustbot` modify labels: rollup
Rollup merge of #149411 - reddevilmidzy:t5, r=Kivooeo Tidying up UI tests [5/N] > [!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
Rollup of 6 pull requests Successful merges: - rust-lang/rust#147952 (Add a timeout to the `remote-test-client` connection) - rust-lang/rust#149321 (Fix ICE when include_str! reads binary files) - rust-lang/rust#149398 (add regression test for issue rust-lang/rust#143987) - rust-lang/rust#149411 (Tidying up UI tests [5/N]) - rust-lang/rust#149413 (add test for issue 143821) - rust-lang/rust#149415 (Remove test-float-parse from workspace list in tidy) r? `@ghost` `@rustbot` modify labels: rollup
Rollup of 6 pull requests Successful merges: - rust-lang/rust#147952 (Add a timeout to the `remote-test-client` connection) - rust-lang/rust#149321 (Fix ICE when include_str! reads binary files) - rust-lang/rust#149398 (add regression test for issue rust-lang/rust#143987) - rust-lang/rust#149411 (Tidying up UI tests [5/N]) - rust-lang/rust#149413 (add test for issue 143821) - rust-lang/rust#149415 (Remove test-float-parse from workspace list in tidy) r? `@ghost` `@rustbot` modify labels: rollup
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