diff options
| author | bors <bors@rust-lang.org> | 2019-08-14 20:49:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-08-14 20:49:07 +0000 |
| commit | 082cf2f9d136166cd1d552d3fb5abb1c46c99a14 (patch) | |
| tree | 6ef4da1d58e6bd5dde9b627629ab4e837d079469 /src/liballoc/collections | |
| parent | c43d03a19f326f4a323569328cc501e86eb6d22e (diff) | |
| parent | f7ff36dcb27b48329e9b1c12f5b78d469fafc067 (diff) | |
| download | rust-082cf2f9d136166cd1d552d3fb5abb1c46c99a14.tar.gz rust-082cf2f9d136166cd1d552d3fb5abb1c46c99a14.zip | |
Auto merge of #63534 - Mark-Simulacrum:stage0-bump, r=Centril
Bump to 1.39 r? @Centril
Diffstat (limited to 'src/liballoc/collections')
| -rw-r--r-- | src/liballoc/collections/btree/node.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/collections/btree/node.rs b/src/liballoc/collections/btree/node.rs index e067096f0c7..0b5a271dbea 100644 --- a/src/liballoc/collections/btree/node.rs +++ b/src/liballoc/collections/btree/node.rs @@ -106,8 +106,8 @@ impl<K, V> LeafNode<K, V> { LeafNode { // As a general policy, we leave fields uninitialized if they can be, as this should // be both slightly faster and easier to track in Valgrind. - keys: uninit_array![_; CAPACITY], - vals: uninit_array![_; CAPACITY], + keys: [MaybeUninit::UNINIT; CAPACITY], + vals: [MaybeUninit::UNINIT; CAPACITY], parent: ptr::null(), parent_idx: MaybeUninit::uninit(), len: 0 @@ -159,7 +159,7 @@ impl<K, V> InternalNode<K, V> { unsafe fn new() -> Self { InternalNode { data: LeafNode::new(), - edges: uninit_array![_; 2*B], + edges: [MaybeUninit::UNINIT; 2*B] } } } |
