BTreeMap: replace Root with NodeRef<Owned, ...> #78104

ssomers · 2020-10-19T12:48:10Z

NodeRef<marker::Owned, …> already exists as a representation of root nodes, and it makes more sense to alias Root to that than to reuse the space-efficient BoxedNode that is oblivious to height, where height is required.

r? @Mark-Simulacrum

Mark-Simulacrum · 2020-10-20T13:42:50Z

I'm going to wait for the changes in #77244 to get rebased away, I think that'll help with review (since we had changed some things upstream in that PR).

That said I think I agree that I like this PR's idea.

bors · 2020-10-21T02:48:27Z

☔ 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

src/etc/gdb_providers.py

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

Mark-Simulacrum · 2020-10-25T22:09:38Z

@bors r+

bors · 2020-10-25T22:09:39Z

📌 Commit 2df9277 has been approved by Mark-Simulacrum

@Mark-Simulacrum

…mulacrum BTreeMap: ban BoxedNode from Root `NodeRef<marker::Owned, …>` already exists as a representation of root nodes, and it makes more sense to alias `Root` to that than to reuse the space-efficient `BoxedNode` that is oblivious to height, where height is required. r? @Mark-Simulacrum

Dylan-DPC-zz · 2020-10-26T01:06:44Z

this has conflicts:

@bors r-

bors · 2020-10-26T01:10:39Z

☔ The latest upstream changes (presumably #78015) 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

ssomers · 2020-10-26T13:06:59Z

Still contains (builds on) #78359. I don't care if they are merged separately, but this one seems more fragile.

Also, I'm now thinking it would be better to stop using the Root alias at the node level and move it up to the map level.

Mark-Simulacrum · 2020-10-26T16:11:59Z

Also, I'm now thinking it would be better to stop using the Root alias at the node level and move it up to the map level.

Hm, I'm not sure I quite follow, but I think this feels wrong -- roots are useful when e.g. splitting out a subtree which will later be joined in a different place. I'm not sure that the code will care too much about this distinction though.

bors · 2020-11-19T19:50:25Z

⌛ Testing commit 9fca57c with merge 23f0c771fe1e965804082861824289a26677c121...

bors · 2020-11-19T21:01:23Z

💔 Test failed - checks-actions

ssomers · 2020-11-19T22:14:48Z

Not a rotten apple this time, but linking with link.exe failed: exit code: 1201 on a Win32 MSVC platform. I found a suggestion that the return code identifies LINK1201: insufficient disk space, invalid path, or insufficient privilege.

PS 🤦‍♂️ that's almost literally what it says one line lower

Mark-Simulacrum · 2020-11-19T23:34:28Z

@bors retry - hopefully spurious, or alternatively everything is going to fail with this...

bors · 2020-11-20T03:33:51Z

⌛ Testing commit 9fca57c with merge 2e68256e76e4afcad0a5a7f96c99a1fe84637847...

rust-log-analyzer · 2020-11-20T03:38:20Z

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

[command]"C:\Program Files\Git\bin\git.exe" submodule foreach --recursive "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :"
[command]"C:\Program Files\Git\bin\git.exe" config --local http.https://github.com/.extraheader "AUTHORIZATION: basic ***"
##[endgroup]
##[group]Fetching the repository
[command]"C:\Program Files\Git\bin\git.exe" -c protocol.version=2 fetch --no-tags --prune --progress --no-recurse-submodules --depth=2 origin +2e68256e76e4afcad0a5a7f96c99a1fe84637847:refs/remotes/origin/auto

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @rust-lang/infra. (Feature Requests)

bors · 2020-11-20T03:40:15Z

💔 Test failed - checks-actions

Mark-Simulacrum · 2020-11-20T16:05:03Z

@bors retry OpenSSL SSL_read: Connection was reset

bors · 2020-11-20T16:12:42Z

⌛ Testing commit 9fca57c with merge 593fe97...

bors · 2020-11-20T18:40:54Z

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 593fe97 to master...

…mulacrum BTreeMap: swap the names of NodeRef::new and Root::new_leaf rust-lang#78104 preserved the name of Root::new_leaf to minimize changes, but the resulting names are confusing. r? `@Mark-Simulacrum`

rust-highfive assigned Mark-Simulacrum Oct 19, 2020

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

ssomers force-pushed the btree_root_redux branch 2 times, most recently from 0db2701 to 591aa08 Compare October 20, 2020 08:15

Mark-Simulacrum mentioned this pull request Oct 20, 2020

BTreeMap: reuse BoxedNode instances directly instead of their contents #77408

Closed

ssomers force-pushed the btree_root_redux branch from 591aa08 to ea4627a Compare October 21, 2020 14:51

ssomers commented Oct 21, 2020

View reviewed changes

src/etc/gdb_providers.py Outdated Show resolved Hide resolved

ssomers mentioned this pull request Oct 22, 2020

BTreeMap: let NodeRef point to the actual type of the node #78222

Closed

ssomers force-pushed the btree_root_redux branch from ea4627a to da61221 Compare October 22, 2020 09:00

ssomers commented Oct 22, 2020

View reviewed changes

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

ssomers force-pushed the btree_root_redux branch from da61221 to b9e727f Compare October 22, 2020 18:41

ssomers mentioned this pull request Oct 25, 2020

BTreeMap: move generic support functions out of navigate.rs #78359

Merged

ssomers force-pushed the btree_root_redux branch from b9e727f to 2df9277 Compare October 25, 2020 18:49

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 25, 2020

This was referenced Oct 26, 2020

Rollup of 10 pull requests #78383

Closed

Rollup of 9 pull requests #78386

Closed

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 26, 2020

ssomers force-pushed the btree_root_redux branch from 2df9277 to 7cf9cf9 Compare October 26, 2020 12:57

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 19, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 19, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 19, 2020

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 20, 2020

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 20, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2020

bors merged commit 593fe97 into rust-lang:master Nov 20, 2020

rustbot added this to the 1.50.0 milestone Nov 20, 2020

bors mentioned this pull request Nov 20, 2020

Fix zero-sized BTreeMap gdb pretty-printer #79235

Merged

ssomers deleted the btree_root_redux branch November 20, 2020 19:29

ssomers mentioned this pull request Nov 22, 2020

BTreeMap: swap the names of NodeRef::new and Root::new_leaf #79297

Merged

ssomers mentioned this pull request Jan 16, 2021

BTreeMap: prevent tree from ever being owned by non-root node #81073

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

BTreeMap: replace Root with NodeRef<Owned, ...> #78104

BTreeMap: replace Root with NodeRef<Owned, ...> #78104

ssomers commented Oct 19, 2020 •

edited

Loading

Mark-Simulacrum commented Oct 20, 2020

bors commented Oct 21, 2020

Mark-Simulacrum commented Oct 25, 2020

bors commented Oct 25, 2020

Dylan-DPC-zz commented Oct 26, 2020

bors commented Oct 26, 2020

ssomers commented Oct 26, 2020

Mark-Simulacrum commented Oct 26, 2020

bors commented Nov 19, 2020

bors commented Nov 19, 2020

ssomers commented Nov 19, 2020 •

edited

Loading

Mark-Simulacrum commented Nov 19, 2020

bors commented Nov 20, 2020

rust-log-analyzer commented Nov 20, 2020

bors commented Nov 20, 2020

Mark-Simulacrum commented Nov 20, 2020

bors commented Nov 20, 2020

bors commented Nov 20, 2020

BTreeMap: replace Root with NodeRef<Owned, ...> #78104

BTreeMap: replace Root with NodeRef<Owned, ...> #78104

Conversation

ssomers commented Oct 19, 2020 • edited Loading

Mark-Simulacrum commented Oct 20, 2020

bors commented Oct 21, 2020

Mark-Simulacrum commented Oct 25, 2020

bors commented Oct 25, 2020

Dylan-DPC-zz commented Oct 26, 2020

bors commented Oct 26, 2020

ssomers commented Oct 26, 2020

Mark-Simulacrum commented Oct 26, 2020

bors commented Nov 19, 2020

bors commented Nov 19, 2020

ssomers commented Nov 19, 2020 • edited Loading

Mark-Simulacrum commented Nov 19, 2020

bors commented Nov 20, 2020

rust-log-analyzer commented Nov 20, 2020

bors commented Nov 20, 2020

Mark-Simulacrum commented Nov 20, 2020

bors commented Nov 20, 2020

bors commented Nov 20, 2020

ssomers commented Oct 19, 2020 •

edited

Loading

ssomers commented Nov 19, 2020 •

edited

Loading