Skip to content

Commit 41b8984

Browse files
committed
---
yaml --- r: 232526 b: refs/heads/try c: 1d72d31 h: refs/heads/master v: v3
1 parent 89775d8 commit 41b8984

File tree

2 files changed

+24
-3
lines changed

2 files changed

+24
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: edeb4f1c86cbf6af8ef9874d4b3af50f721ea1b8
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
4-
refs/heads/try: 101ebe0bb05cc93939a3b57cbfd91f2a765dc9c4
4+
refs/heads/try: 1d72d314480d3437345129ddf8b299c36e048f18
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
66
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
77
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/libcollections/btree/node.rs

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,8 +387,29 @@ impl<K, V> Node<K, V> {
387387

388388
#[inline]
389389
pub fn as_slices_internal_mut<'b>(&'b mut self) -> MutNodeSlice<'b, K, V> {
390-
// FIXME(#27620): Bad: This relies on structure layout!
391-
unsafe { mem::transmute(self.as_slices_internal()) }
390+
let len = self.len();
391+
let is_leaf = self.is_leaf();
392+
let keys = unsafe { slice::from_raw_parts_mut(*self.keys, len) };
393+
let vals = unsafe { slice::from_raw_parts_mut(*self.vals, len) };
394+
let edges: &mut [_] = if is_leaf {
395+
&mut []
396+
} else {
397+
unsafe {
398+
let data = match self.edges {
399+
None => heap::EMPTY as *mut Node<K,V>,
400+
Some(ref mut p) => **p as *mut Node<K,V>,
401+
};
402+
slice::from_raw_parts_mut(data, len + 1)
403+
}
404+
};
405+
MutNodeSlice {
406+
keys: keys,
407+
vals: vals,
408+
edges: edges,
409+
head_is_edge: true,
410+
tail_is_edge: true,
411+
has_edges: !is_leaf,
412+
}
392413
}
393414

394415
#[inline]

0 commit comments

Comments
 (0)