Skip to content

Merge signed-int into master#723

Merged
tarcieri merged 2 commits into
masterfrom
signed-int
Jan 9, 2025
Merged

Merge signed-int into master#723
tarcieri merged 2 commits into
masterfrom
signed-int

Conversation

@tarcieri

@tarcieri tarcieri commented Jan 7, 2025

Copy link
Copy Markdown
Member

Lands the signed Int functionality on the master branch, effectively stabilizing the functionality prior to the v0.6 release

@tarcieri

tarcieri commented Jan 7, 2025

Copy link
Copy Markdown
Member Author

Looks like a small merge conflict in non_zero.rs

@erik-3milabs

Copy link
Copy Markdown
Contributor

Looks like a small merge conflict in non_zero.rs

I know how to merge this, but when I press "resolve conflicts", I'm greeted with a 404. Chances are I'm not allowed to look at that screen because I don't have appropriate rights?

@tarcieri

tarcieri commented Jan 8, 2025

Copy link
Copy Markdown
Member Author

I tried to merge this locally and ran into some very weird errors.

@erik-3milabs What did your resolution look like? Can you push the commit up to a branch?

@tarcieri

tarcieri commented Jan 8, 2025

Copy link
Copy Markdown
Member Author

Oh I see, it's #710 that's causing problems. I guess we can't just merge things as-is.

@erik-3milabs

Copy link
Copy Markdown
Contributor

@tarcieri I have both merged signed-int with master and rebased it onto master. Feel free to have a look and determine the solution you deem most appropriate. Let me know what I can do to help out!

@tarcieri

tarcieri commented Jan 9, 2025

Copy link
Copy Markdown
Member Author

@erik-3milabs can you open a PR for the merged-signed-int branch which can replace this one? (also, it looks like it needs rustfmt)

@erik-3milabs

Copy link
Copy Markdown
Contributor

@erik-3milabs can you open a PR for the merged-signed-int branch which can replace this one? (also, it looks like it needs rustfmt)

@tarcieri done. It is up now as #730.

@tarcieri tarcieri merged commit 9470032 into master Jan 9, 2025
@tarcieri tarcieri deleted the signed-int branch January 9, 2025 14:44
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.

2 participants