Skip to content

Conversation

Veykril
Copy link
Member

@Veykril Veykril commented Jun 26, 2025

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 26, 2025
@lnicola
Copy link
Member

lnicola commented Jun 26, 2025

Should we ask oli-obk to drop the r-a changes from that PR? I know they shouldn't cause conflicts, but..

@oli-obk
Copy link
Contributor

oli-obk commented Jun 26, 2025

yea sorry, overlooked that. I just searched and replaced

@Veykril
Copy link
Member Author

Veykril commented Jun 26, 2025

No worries, same diffs overlapping don't cause conflicts afaik and fixing this (as in the tests failing) before the next sync wouldn't have been a lot of trouble (if it was I would've raised it in your PR)

@Veykril Veykril added this pull request to the merge queue Jun 26, 2025
Merged via the queue into rust-lang:master with commit d2691ac Jun 26, 2025
14 checks passed
@Veykril Veykril deleted the push-qtmwnuqvsruw branch June 26, 2025 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants