Skip to content
This repository has been archived by the owner on Nov 23, 2022. It is now read-only.

prefer .expect instead of unwrapping into a panic #87

Merged
merged 10 commits into from
Jul 17, 2022
Merged

Conversation

jay3332
Copy link
Member

@jay3332 jay3332 commented Jul 14, 2022

Additionally run the sqlx::migrate macro with no arguments since it defaults to ../migrations (which is what it was before)

@jay3332 jay3332 requested a review from a team as a code owner July 14, 2022 23:18
@randomairborne
Copy link
Contributor

Please fix the checks.

@jay3332
Copy link
Member Author

jay3332 commented Jul 15, 2022

Please fix the checks.

neither of them seem very fixable to me/related as a result of this PR, potentially a seperate PR could be created to fix these checks. with this project not having been touched in a long time im pretty sure many are related to breaking changes (since the server uses nightly.)

one example is SyncOnceCell which was renamed to OnceLock

@randomairborne
Copy link
Contributor

They’re still worth fixing.

randomairborne
randomairborne previously approved these changes Jul 15, 2022
@hydrostaticcog
Copy link
Member

Since the checks originate in an area of the code that is not being changed here, I think it is fine. I am approving, but I do want to wait for @tazz4843 to merge.

@hydrostaticcog
Copy link
Member

I take it back, this needs to go onto the dev branch to avoid conflicts down the line.

Copy link
Member

@hydrostaticcog hydrostaticcog left a comment

Choose a reason for hiding this comment

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

Target develop branch

@jay3332
Copy link
Member Author

jay3332 commented Jul 15, 2022

Target develop branch

just a heads up, develop is 9 commits behind master although im sure you can just merge

@jay3332 jay3332 changed the base branch from master to develop July 15, 2022 02:01
@jay3332 jay3332 dismissed randomairborne’s stale review July 15, 2022 02:01

The base branch was changed.

@jay3332
Copy link
Member Author

jay3332 commented Jul 15, 2022

commit is now targeted to develop

@hydrostaticcog
Copy link
Member

The missing commits appear to be merge commits, so I am not concerned. Approving now.

@tazz4843 tazz4843 merged commit 58ac4d6 into develop Jul 17, 2022
@hydrostaticcog hydrostaticcog deleted the jay3332-patch-1 branch July 17, 2022 02:56
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
enhancement New feature or request Errors
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants