Skip to content
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

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

Merged
merged 1 commit into from
Nov 20, 2020

Conversation

ssomers
Copy link
Contributor

@ssomers ssomers commented Oct 19, 2020

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 19, 2020
@ssomers ssomers force-pushed the btree_root_redux branch 2 times, most recently from 0db2701 to 591aa08 Compare October 20, 2020 08:15
@Mark-Simulacrum
Copy link
Member

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
Copy link
Contributor

bors commented Oct 21, 2020

☔ 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 Outdated Show resolved Hide resolved
@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Oct 25, 2020

📌 Commit 2df9277 has been approved by Mark-Simulacrum

@bors 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
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Oct 26, 2020
…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
This was referenced Oct 26, 2020
@Dylan-DPC-zz
Copy link

this has conflicts:

@bors r-

@bors 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
@bors
Copy link
Contributor

bors commented Oct 26, 2020

☔ 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
Copy link
Contributor Author

ssomers commented Oct 26, 2020

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
Copy link
Member

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 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
Copy link
Contributor

bors commented Nov 19, 2020

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

@bors
Copy link
Contributor

bors commented Nov 19, 2020

💔 Test failed - checks-actions

@bors 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
@ssomers
Copy link
Contributor Author

ssomers commented Nov 19, 2020

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
Copy link
Member

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

@bors 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
Copy link
Contributor

bors commented Nov 20, 2020

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

@rust-log-analyzer
Copy link
Collaborator

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
Copy link
Contributor

bors commented Nov 20, 2020

💔 Test failed - checks-actions

@bors 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
@Mark-Simulacrum
Copy link
Member

@bors retry OpenSSL SSL_read: Connection was reset

@bors 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
Copy link
Contributor

bors commented Nov 20, 2020

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

@bors
Copy link
Contributor

bors commented Nov 20, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 20, 2020
@bors bors merged commit 593fe97 into rust-lang:master Nov 20, 2020
@rustbot rustbot added this to the 1.50.0 milestone Nov 20, 2020
@ssomers ssomers deleted the btree_root_redux branch November 20, 2020 19:29
m-ou-se added a commit to m-ou-se/rust that referenced this pull request Nov 22, 2020
…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`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants