Skip to content

Conversation

Giga-Bowser
Copy link
Contributor

closes #18383
I also reorganized some of the tests for the fix to add a missing Ok() or Some() wrapper as they were somewhat scattered. The diff for this ended up looking messy but it's just moving functions around.

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 1, 2024
@bors
Copy link
Contributor

bors commented Dec 7, 2024

☔ The latest upstream changes (presumably #18630) made this pull request unmergeable. Please resolve the merge conflicts.

@Giga-Bowser Giga-Bowser force-pushed the master branch 2 times, most recently from 8b2dafa to 03a050a Compare December 8, 2024 18:36
Copy link
Member

@Veykril Veykril left a comment

Choose a reason for hiding this comment

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

Thanks!

I also reorganized the tests in a more logical order, and removed the redundant `test_` prefix from their names.
This caused a bug that was rather tricky to hunt down!
Copy link
Member

@Veykril Veykril left a comment

Choose a reason for hiding this comment

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

Thanks!

@Veykril Veykril added this pull request to the merge queue Dec 11, 2024
Merged via the queue into rust-lang:master with commit 41f3319 Dec 11, 2024
9 checks passed
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.

Add/remove Some() or Ok() or Err() wrapper
4 participants