BTreeMap: Support custom allocators #77438

exrook · 2020-10-02T01:11:20Z

Moved to #98103

Related:
rust-lang/wg-allocators#7
https://github.com/TimDiekmann/alloc-wg

Blocked on:
~~#77187~~
~~#78459~~
~~#95036~~

rust-highfive · 2020-10-02T01:11:23Z

(rust_highfive has picked a reviewer for you, use r? to override)

bors · 2020-10-02T03:40:41Z

☔ The latest upstream changes (presumably #77436) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

exrook · 2020-10-02T17:43:32Z

@rustbot modify labels: +A-allocators +T-libs

bors · 2020-10-03T01:08:09Z

☔ The latest upstream changes (presumably #77470) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

library/alloc/src/collections/btree/map.rs

TimDiekmann · 2020-10-03T13:12:24Z

cc @Amanieu

cramertj · 2020-10-05T16:28:04Z

r? @Amanieu

bors · 2020-10-15T21:52:47Z

☔ The latest upstream changes (presumably #77981) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

BTreeMap: refactor Entry out of map.rs into its own file btree/map.rs is approaching the 3000 line mark, splitting out the entry code buys about 500 lines of headroom. I've created this PR because the changes I've made in rust-lang#77438 will push `map.rs` over the 3000 line limit and cause tidy to complain. I picked `Entry` to factor out because it feels less tightly coupled to the rest of `BTreeMap` than the various iterator implementations. Related: rust-lang#60302

bors · 2020-10-17T22:21:03Z

☔ The latest upstream changes (presumably #78060) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

bors · 2020-10-21T02:35:39Z

☔ The latest upstream changes (presumably #77244) made this pull request unmergeable. Please resolve the merge conflicts.

Note that reviewers usually do not review pull requests until merge conflicts are resolved! Once you resolve the conflicts, you should change the labels applied by bors to indicate that your PR is ready for review. Post this as a comment to change the labels:

@rustbot modify labels: +S-waiting-on-review -S-waiting-on-author

bors · 2022-04-06T01:57:37Z

☔ The latest upstream changes (presumably #95702) made this pull request unmergeable. Please resolve the merge conflicts.

JohnCSimon · 2022-04-24T22:45:54Z

Triage:
@Amanieu is this ready for review?

Amanieu

Sorry about the late review, this looks good modulo the leftover test code. Can you rebase to resolve the conflicts?

Amanieu · 2022-05-03T06:20:37Z

src/bootstrap/builder.rs

@@ -1684,6 +1684,7 @@ impl<'a> Builder<'a> {
                rustflags.arg(&format!("-Cllvm-args=-import-instr-limit={}", limit));
            }
        }
+        cargo.env(profile_var("LTO"), "off");


Leftover from testing?

TennyZhuang · 2022-06-07T02:57:07Z

What's the status of the PR? I'd like to help with something.

Amanieu · 2022-06-09T23:19:26Z

@TennyZhuang Since the author is not responding, you can take over by forking their code and opening a new PR.

TennyZhuang · 2022-06-10T04:22:09Z

@exrook Sorry but I really need the feature, I'll take over the PR at the weekend. 🥰

TennyZhuang · 2022-06-12T04:42:01Z

@Amanieu Hi, I've resolved the conflicts and submitted a new PR #98015, PTAL Thanks!

Dylan-DPC · 2022-06-12T06:31:41Z

Closing this in favour of #98015

exrook · 2022-06-12T19:53:19Z

@TennyZhuang I'm glad to hear you're also looking to use this feature! My apologies for not responding sooner, I've been busy with other things, and when I last attempted a rebase on master back in May I was still hitting box-related ICEs so I've been working on a branch based on top of #95576, though it seems now those ICEs have been fixed in master :).

@Dylan-DPC Hi, could this be re-opened? I've put a lot of effort into keeping these changes in sync with master over the past year+ and a half and I'd like to see it through to being merged. :)

@Amanieu Thanks for the review! I've rebased on master and removed the leftover test code, so this should be good to go if you have no other comments

TennyZhuang · 2022-06-13T00:35:43Z

@exrook I’m glad to hear that, and really hope the PR can be merged ASAP.
@Dylan-DPC @Amanieu Can you help to reopen the PR and review it again? Sorry for the extra review work.

Amanieu · 2022-06-13T00:37:53Z

GIthub doesn't let me reopen the PR after a force-push/rebase. You'll need to open a new one.

TennyZhuang · 2022-06-13T00:46:23Z

@exrook I’ve found that it’s possible to reopen the PR, but you have to revert the commits back to the one before closed, and commit them again, sorry.

See https://gist.github.com/robertpainsi/2c42c15f1ce6dab03a0675348edd4e2c

Feel free to reopen the PR or just create a new one.

Dylan-DPC · 2022-06-13T05:27:35Z

@exrook unfortunately you can't reöpen this. You can submit a new pull request and link this one in the description and we can take it from there

exrook · 2022-06-14T18:02:42Z

Thanks everyone! I've opened a new PR at #98103

BTreeMap: Support custom allocators (v1.5) Related: rust-lang/wg-allocators#7 https://github.com/TimDiekmann/alloc-wg Blocked on: ~~rust-lang#77187~~ ~~rust-lang#78459~~ ~~rust-lang#95036~~ previous: rust-lang#77438

rust-highfive assigned cramertj Oct 2, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 2, 2020

exrook force-pushed the btreemap-alloc branch 2 times, most recently from 41c0200 to c7237fa Compare October 2, 2020 04:13

rustbot added A-allocators Area: Custom and system allocators T-libs-api Relevant to the library API team, which will review and decide on the PR/issue. labels Oct 2, 2020

exrook force-pushed the btreemap-alloc branch from c7237fa to 6d0cfa5 Compare October 2, 2020 17:46

This comment has been minimized.

Sign in to view

rustbot added S-blocked Status: Blocked on something else such as an RFC or other implementation work. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 3, 2020

TimDiekmann mentioned this pull request Oct 3, 2020

Tracking Issue for structs which needs an allocator rust-lang/wg-allocators#7

Open

15 tasks

TimDiekmann suggested changes Oct 3, 2020

View reviewed changes

library/alloc/src/collections/btree/map.rs Outdated Show resolved Hide resolved

library/alloc/src/collections/btree/map.rs Outdated Show resolved Hide resolved

rust-highfive assigned Amanieu and unassigned cramertj Oct 5, 2020

exrook force-pushed the btreemap-alloc branch from 6d0cfa5 to 78a3633 Compare October 12, 2020 11:01

exrook mentioned this pull request Oct 12, 2020

BTreeMap: refactor Entry out of map.rs into its own file #77851

Merged

exrook force-pushed the btreemap-alloc branch from 78a3633 to da43320 Compare October 17, 2020 18:06

exrook force-pushed the btreemap-alloc branch from da43320 to cf67d7d Compare October 17, 2020 23:24

This comment has been minimized.

Sign in to view

exrook added 4 commits March 22, 2022 08:50

BTreeMap: Add alloc param

072a239

btreemap-alloc: fix clear impl

09511dc

btreemap-alloc: adjust ui test

ea25822

hack/workaround: disable LTO

713f4d5

exrook force-pushed the btreemap-alloc branch from 72e48ac to 713f4d5 Compare March 22, 2022 12:50

exrook marked this pull request as ready for review March 23, 2022 12:00

Amanieu approved these changes May 3, 2022

View reviewed changes

Dylan-DPC added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 24, 2022

TennyZhuang mentioned this pull request Jun 7, 2022

feat(stream): introduce allocator_api in JoinHashMap risingwavelabs/risingwave#3020

Merged

3 tasks

TennyZhuang mentioned this pull request Jun 12, 2022

BTreeMap: Support custom allocators #98015

Closed

Dylan-DPC closed this Jun 12, 2022

exrook mentioned this pull request Jun 14, 2022

BTreeMap: Support custom allocators (v1.5) #98103

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BTreeMap: Support custom allocators #77438

BTreeMap: Support custom allocators #77438

exrook commented Oct 2, 2020 •

edited

Loading

rust-highfive commented Oct 2, 2020

bors commented Oct 2, 2020

exrook commented Oct 2, 2020

bors commented Oct 3, 2020

This comment has been minimized.

TimDiekmann commented Oct 3, 2020

cramertj commented Oct 5, 2020

bors commented Oct 15, 2020

bors commented Oct 17, 2020

bors commented Oct 21, 2020

This comment has been minimized.

bors commented Apr 6, 2022

JohnCSimon commented Apr 24, 2022

Amanieu left a comment

Amanieu May 3, 2022

TennyZhuang commented Jun 7, 2022

Amanieu commented Jun 9, 2022

TennyZhuang commented Jun 10, 2022

TennyZhuang commented Jun 12, 2022

Dylan-DPC commented Jun 12, 2022

exrook commented Jun 12, 2022

TennyZhuang commented Jun 13, 2022

Amanieu commented Jun 13, 2022

TennyZhuang commented Jun 13, 2022 •

edited

Loading

Dylan-DPC commented Jun 13, 2022

exrook commented Jun 14, 2022

BTreeMap: Support custom allocators #77438

BTreeMap: Support custom allocators #77438

Conversation

exrook commented Oct 2, 2020 • edited Loading

rust-highfive commented Oct 2, 2020

bors commented Oct 2, 2020

exrook commented Oct 2, 2020

bors commented Oct 3, 2020

This comment has been minimized.

TimDiekmann commented Oct 3, 2020

cramertj commented Oct 5, 2020

bors commented Oct 15, 2020

bors commented Oct 17, 2020

bors commented Oct 21, 2020

This comment has been minimized.

bors commented Apr 6, 2022

JohnCSimon commented Apr 24, 2022

Amanieu left a comment

Choose a reason for hiding this comment

Amanieu May 3, 2022

Choose a reason for hiding this comment

TennyZhuang commented Jun 7, 2022

Amanieu commented Jun 9, 2022

TennyZhuang commented Jun 10, 2022

TennyZhuang commented Jun 12, 2022

Dylan-DPC commented Jun 12, 2022

exrook commented Jun 12, 2022

TennyZhuang commented Jun 13, 2022

Amanieu commented Jun 13, 2022

TennyZhuang commented Jun 13, 2022 • edited Loading

Dylan-DPC commented Jun 13, 2022

exrook commented Jun 14, 2022

exrook commented Oct 2, 2020 •

edited

Loading

TennyZhuang commented Jun 13, 2022 •

edited

Loading