diff options
| author | bors <bors@rust-lang.org> | 2019-03-28 02:00:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-03-28 02:00:57 +0000 |
| commit | d20e0002725d2b3efff23c97450806b3517ba804 (patch) | |
| tree | 30dcba1cf4ff7e25de3fd495278e0458ba6c5c98 /src/liballoc | |
| parent | 33ef0bad21d6bb646c7c3ab0dbf381ca96c324bf (diff) | |
| parent | a2c4562690db552c845804223e302d42efd48c98 (diff) | |
| download | rust-d20e0002725d2b3efff23c97450806b3517ba804.tar.gz rust-d20e0002725d2b3efff23c97450806b3517ba804.zip | |
Auto merge of #59471 - cuviper:rollup, r=cuviper
Rollup of 18 pull requests
Successful merges:
- #57293 (Make some lints incremental)
- #57565 (syntax: Remove warning for unnecessary path disambiguators)
- #58253 (librustc_driver => 2018)
- #58837 (librustc_interface => 2018)
- #59268 (Add suggestion to use `&*var` when `&str: From<String>` is expected)
- #59283 (Make ASCII case conversions more than 4× faster)
- #59284 (adjust MaybeUninit API to discussions)
- #59372 (add rustfix-able suggestions to trim_{left,right} deprecations)
- #59390 (Make `ptr::eq` documentation mention fat-pointer behavior)
- #59393 (Refactor tuple comparison tests)
- #59420 ([CI] record docker image info for reuse)
- #59421 (Reject integer suffix when tuple indexing)
- #59430 (Renames `EvalContext` to `InterpretCx`)
- #59439 (Generalize diagnostic for `x = y` where `bool` is the expected type)
- #59449 (fix: Make incremental artifact deletion more robust)
- #59451 (Add `Default` to `std::alloc::System`)
- #59459 (Add some tests)
- #59460 (Include id in Thread's Debug implementation)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/btree/node.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index 66d619b1298..581c66c7086 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -109,7 +109,7 @@ impl<K, V> LeafNode<K, V> { keys: uninitialized_array![_; CAPACITY], vals: uninitialized_array![_; CAPACITY], parent: ptr::null(), - parent_idx: MaybeUninit::uninitialized(), + parent_idx: MaybeUninit::uninit(), len: 0 } } @@ -129,7 +129,7 @@ unsafe impl Sync for NodeHeader<(), ()> {} // ever take a pointer past the first key. static EMPTY_ROOT_NODE: NodeHeader<(), ()> = NodeHeader { parent: ptr::null(), - parent_idx: MaybeUninit::uninitialized(), + parent_idx: MaybeUninit::uninit(), len: 0, keys_start: [], }; @@ -261,7 +261,7 @@ impl<K, V> Root<K, V> { -> NodeRef<marker::Mut<'_>, K, V, marker::Internal> { debug_assert!(!self.is_shared_root()); let mut new_node = Box::new(unsafe { InternalNode::new() }); - new_node.edges[0].set(unsafe { BoxedNode::from_ptr(self.node.as_ptr()) }); + new_node.edges[0].write(unsafe { BoxedNode::from_ptr(self.node.as_ptr()) }); self.node = BoxedNode::from_internal(new_node); self.height += 1; @@ -737,7 +737,7 @@ impl<'a, K, V> NodeRef<marker::Mut<'a>, K, V, marker::Internal> { unsafe { ptr::write(self.keys_mut().get_unchecked_mut(idx), key); ptr::write(self.vals_mut().get_unchecked_mut(idx), val); - self.as_internal_mut().edges.get_unchecked_mut(idx + 1).set(edge.node); + self.as_internal_mut().edges.get_unchecked_mut(idx + 1).write(edge.node); (*self.as_leaf_mut()).len += 1; @@ -1080,7 +1080,7 @@ impl<'a, K, V> Handle<NodeRef<marker::Mut<'a>, K, V, marker::Internal>, marker:: let mut child = self.descend(); unsafe { (*child.as_leaf_mut()).parent = ptr; - (*child.as_leaf_mut()).parent_idx.set(idx); + (*child.as_leaf_mut()).parent_idx.write(idx); } } |
