diff options
| author | bors <bors@rust-lang.org> | 2018-07-21 10:30:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-07-21 10:30:11 +0000 |
| commit | ef9781358daa0a70bdaf11c9f792210ea30dd396 (patch) | |
| tree | bf8c92645e52a9f85376cb16b56816f6d42fd2d4 /src/liballoc | |
| parent | bd455ef165f110143b97106b4e7cd8c83cd21f03 (diff) | |
| parent | 382285a01de393ecc9dd2c78c2518299d8749c12 (diff) | |
| download | rust-ef9781358daa0a70bdaf11c9f792210ea30dd396.tar.gz rust-ef9781358daa0a70bdaf11c9f792210ea30dd396.zip | |
Auto merge of #52555 - petrochenkov:mresfact, r=alexcrichton
resolve: Some renaming, refactoring and comments Commits are self-descriptive. The only functional change is https://github.com/rust-lang/rust/commit/34bf2f572e33d4df1459413b5014ca98fc9fa4e0 that tightens shadowing rules for macro paths (makes the second and third cases in `test/ui/imports/glob-shadowing.rs` an error).
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/node.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index 19bdcbc6ad6..0ae45b31232 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -103,7 +103,7 @@ impl<K, V> LeafNode<K, V> { } fn is_shared_root(&self) -> bool { - self as *const _ == &EMPTY_ROOT_NODE as *const _ as *const LeafNode<K, V> + ptr::eq(self, &EMPTY_ROOT_NODE as *const _ as *const _) } } |