Skip to content

Commit 977a735

Browse files
committed
---
yaml --- r: 15198 b: refs/heads/try c: 6f0cbf4 h: refs/heads/master v: v3
1 parent f17a20b commit 977a735

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 0d5d2e5e149f3ca1907e924968e36ca6fe5f45e9
5+
refs/heads/try: 6f0cbf4cd4364ee5d7b2c723089dfacf711df8f4
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libstd/arena.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ impl arena for arena {
3737
end = n_bytes;
3838
}
3939

40-
let p = ptr::offset(ptr::addr_of(head.fill), start);
41-
head.fill = end;
42-
unsafe { ret unsafe::reinterpret_cast(p); }
40+
unsafe {
41+
let p = ptr::offset(vec::unsafe::to_ptr(head.data), start);
42+
head.fill = end;
43+
ret unsafe::reinterpret_cast(p);
44+
}
4345
}
4446
}
4547

0 commit comments

Comments
 (0)