-
Notifications
You must be signed in to change notification settings - Fork 13.3k
Revised again: Added TotalEq/TotalOrd/Clone functionality and related tests to B-tree #11263
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
Conversation
(when (looking-at "[[:space:]]") | ||
(forward-word 1) | ||
(backward-word 1)) | ||
(when (looking-at "[[:space:]]") (forward-to-word 1)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was this intentional? Looks like this might have been an accidental revert.
Howdy, @niftynif. This history is pretty gnarly, with all the merges and seemingly duplicate commits. Can you try to rebase it and squash it into a single commit to make it easier to understand? I would start by doing a I haven't looked closely at the logic here since I am that familiar with B-Trees but if nobody else picks it up over the weekend I'll try to take a crack at it after your rebase. |
Hey @brson, Tim went over the content of the code with me, so we should be set on that front. I have a few suggestions from him to implement in the next day or so, and I plan to get on that as soon as I can. I wrote down a series of revisions to make quickly (many having to do with style). Thanks again for your help! |
New commits: I opted to keep the [allow(unused_variable)] because it will be taken out once the insertion methods become more than stubs, which will hopefully be on my next PR. |
Hey @niftynif -- this looks good, but as @brson said, we should really make sure the commit history looks sensible before merging. It's tidier to not have the patch removing the .el file and then the one restoring it at all than to have the two patches in the history, even if the net effect is correct. This should be achievable with |
Equals is now compact and uses vec's equals method. Cmp compares all elements on branches and leaves (Nodes).
Hooray! I'm going to review this. |
I'm digging into Bors' logs to see what happened but I'm not really sure what is going on here. Is there anyone who can help me figure it out? I made sure I had a working build before I submitted the PR so I'm a little confused. |
Apologies for junking up the feed with all of these separate pull requests. I'm still getting the hang of git and will hopefully be doing less of this nonsense soon. I opened up another PR and closed the one from earlier today because the first PR was coming from the wrong branch of my repo. Anyway, this contains a fleshed-out implementation of TotalEq/TotalOrd/Clone/ToStr for the whole B-tree structure and relevant tests, integrating suggestions and comments from several community members. r? @catamorphism
@niftynif It was a spurious failure, unrelated to your patch. We'll just retry. |
[`arithmetic_side_effects`] Fix rust-lang#11262 Fix rust-lang#11262 Rustc already handles paths that refer literals -> https://play.rust-lang.org/?version=stable&mode=debug&edition=2021&gist=d795058a2e1634c867288c20ff9432c8 ``` changelog: [`arithmetic_side_effects`]: Ignore paths that refer literals ```
Apologies for junking up the feed with all of these separate pull requests. I'm still getting the hang of git and will hopefully be doing less of this nonsense soon. I opened up another PR and closed the one from earlier today because the first PR was coming from the wrong branch of my repo.
Anyway, this contains a fleshed-out implementation of TotalEq/TotalOrd/Clone/ToStr for the whole B-tree structure and relevant tests, integrating suggestions and comments from several community members.
r? @catamorphism