Follow up on BTreeMap comments #70979
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
ssomers
commented
Apr 10, 2020
| @@ -161,7 +161,7 @@ impl<K, V> Root<K, V> { | |||
| NodeRef { | |||
| height: self.height, | |||
| node: self.node.as_ptr(), | |||
| root: self as *const _ as *mut _, | |||
| root: ptr::null(), | |||
There was a problem hiding this comment.
In accordance with the old comment on line 256 and reality (nobody needs that root).
ssomers
commented
Apr 10, 2020
| @@ -179,7 +179,7 @@ impl<K, V> Root<K, V> { | |||
| NodeRef { | |||
| height: self.height, | |||
| node: self.node.as_ptr(), | |||
| root: ptr::null_mut(), // FIXME: Is there anything better to do here? | |||
| root: ptr::null(), | |||
There was a problem hiding this comment.
I doubt that comment was about the unnecessary _mut for a marker::Immut NodeRef, but I think the question has timed out for this particular place, and applies to everything in BTreeMap anyway.
|
@bors r+ rollup |
|
📌 Commit de39a4f has been approved by |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 10, 2020
Rollup of 9 pull requests Successful merges: - rust-lang#69745 (Use `PredicateObligation`s instead of `Predicate`s) - rust-lang#70938 (Add ThreadSanitizer test case) - rust-lang#70973 (Use forward traversal for unconditional recursion lint) - rust-lang#70978 (compiletest: let config flags overwrite -A unused) - rust-lang#70979 (Follow up on BTreeMap comments) - rust-lang#70981 (Rearrange BTreeMap::into_iter to match range_mut.) - rust-lang#70985 (Clean up E0512 explanation) - rust-lang#70988 (Setup the `@rustbot prioritize` command) - rust-lang#70991 (fix rustc-dev-guide's url in src/librustc_codegen_ssa) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
r? @Amanieu (for the first commit)