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

Sync BTreeMap with stdlib #25

Merged
merged 2 commits into from
Sep 24, 2020
Merged

Sync BTreeMap with stdlib #25

merged 2 commits into from
Sep 24, 2020

Conversation

exrook
Copy link
Contributor

@exrook exrook commented Sep 24, 2020

I've pulled in the changes made to BTreeMap in stdlib that happened since my first pull of the BTreeMap code.

These changes are based off the stdlib BTreeMap as of commit 3a4da87f58099f08620a9a3e812abd77301cafb2

I also sorted the feature flags & lint definitions since they didn't seem to follow any pattern.

@TimDiekmann
Copy link
Owner

Do you think it's worth the effort on alloc-wg right now as we can push those changes upstream pretty soon?

I'm planing on deprecating this crate after most collections has been updated upstream as there is no point in keeping alloc-wg updated.

@TimDiekmann TimDiekmann merged commit ad59e56 into TimDiekmann:master Sep 24, 2020
@exrook
Copy link
Contributor Author

exrook commented Sep 24, 2020

I've had the same thoughts, and I've been working on getting the changes pushed in the other direction as well. However the stdlib btreemap implementation diverged a bit since my initial changes, and it was easier to get the new changes working here first. (Notably, I need Box<T, A>, which needs RawVec<T, A> in order to get anything to compile)

@TimDiekmann
Copy link
Owner

TimDiekmann commented Sep 24, 2020 via email

@exrook
Copy link
Contributor Author

exrook commented Sep 24, 2020

Yeah I started copying the Box changes from this repo and once I saw #[lang = "owned_box"] I realized it would be quite a bit more involved than I had originally thought :)

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants