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

[ssomers]

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]

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]

☔ 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

[Mark-Simulacrum]

@bors r+

[bors]

📌 Commit 2df9277 has been approved by Mark-Simulacrum

[Dylan-DPC-zz]

this has conflicts:

@bors r-

[bors]

☔ 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]

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]

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]

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

[bors]

💔 Test failed - checks-actions

[ssomers]

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]

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

[bors]

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

[rust-log-analyzer]

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]

💔 Test failed - checks-actions

[Mark-Simulacrum]

@bors retry OpenSSL SSL_read: Connection was reset

[bors]

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

[bors]

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