Skip to content

Conversation

@ada4a
Copy link
Contributor

@ada4a ada4a commented Oct 21, 2025

changelog: none

@rustbot rustbot added needs-fcp S-waiting-on-review Status: Awaiting review from the assignee but also interested parties labels Oct 21, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 21, 2025

r? @Jarcho

rustbot has assigned @Jarcho.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@ada4a ada4a force-pushed the lines_filter_map_ok branch from f1d918e to 701a1ae Compare October 21, 2025 13:58
@Jarcho Jarcho removed the needs-fcp label Oct 21, 2025
@Jarcho
Copy link
Contributor

Jarcho commented Oct 21, 2025

Can you make the first commit strictly a file rename. It helps significantly with merge conflicts.

@ada4a
Copy link
Contributor Author

ada4a commented Oct 21, 2025

Done. I was hesitant to have a broken intermittent commit, but the diff does come out a bit nicer

@ada4a ada4a removed the needs-fcp label Oct 26, 2025
Copy link
Contributor

@Jarcho Jarcho left a comment

Choose a reason for hiding this comment

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

@Jarcho Jarcho added this pull request to the merge queue Oct 26, 2025
Merged via the queue into rust-lang:master with commit 25cbcb4 Oct 26, 2025
11 checks passed
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties label Oct 26, 2025
@Jarcho
Copy link
Contributor

Jarcho commented Oct 26, 2025

Done. I was hesitant to have a broken intermittent commit, but the diff does come out a bit nicer

It's generally preferred if they pass tests, but that's not a hard rule and nothing actually breaks (bisect needs to use --first-parent). File renaming is one of the biggest reasons to ignore that rule.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants