-
Notifications
You must be signed in to change notification settings - Fork 12.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
alloc: add some try_* methods Rust-for-Linux needs #91559
Conversation
r? @m-ou-se (rust-highfive has picked a reviewer for you, use r? to override) |
This comment has been minimized.
This comment has been minimized.
Thank you!!! |
Signed-off-by: Xuanwo <[email protected]>
Signed-off-by: Xuanwo <[email protected]>
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Xuanwo <[email protected]>
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Xuanwo <[email protected]>
ping @Ericson2314, this PR basically works now. Can you take a quick to confirm that I'm on the right track? |
This comment has been minimized.
This comment has been minimized.
Signed-off-by: Xuanwo <[email protected]>
The job Click to see the possible cause of the failure (guessed by this bot)
|
@Xuanwo do you think you could preserve the old history splitting into multiple commits, such that each work? Also remember you need to test with |
The history is so complex that I can't preserve them simply (the base is so different). My plan is to squash all old commits into one which authored with your name and keep my changes as you suggested. What do you think? |
@Xuanwo the reason I did the split was because some of the later commits might introduce performance regressions. It was something that came up in the meetings. |
I will take a brief look at the rebase. |
@Ericson2314 OK, let me try it again. Is there any convenient way to switch the base from Rust-for-Linux to rust-lang? I spent a lot time to fix the conflict :( |
@Xuanwo give me like 10 minutes to see if I can do it on your behalf. I have done a lot of rebase I think I can port over your conflict resolutions OK. (I also feel it's a bit on me because I didn't mention that preserving history is good from the get-go. I can fix the mistake I made :) ) |
Unfortunately GitHub doesn't let one change the base branch of PRs. |
Yes, we have to do it via git. |
@Xuanwo OK I did the rebase and forced pushed. It can now be compared to your branch, since they share your base branch. What I recommend doing is an interactive on that same base commit (d594910), but where you edit each commit of mine, and pull over the relevant fixes from yours for that commit. Now that can glance the diff showing your changes, they look good :). Just make sure |
☔ The latest upstream changes (presumably #92220) made this pull request unmergeable. Please resolve the merge conflicts. |
I can't continue this work due to lack of time recently, let's close this PR for now, thanks for the help! |
This PR is a follow-up to the #86938.
Part work of #86942
Has been rebased onto rust-lang's master.
I will figure out all CI problems before request review.