Skip to content

Commit c53b4f3

Browse files
committed
auto merge of #4975 : thestinger/rust/rt, r=nikomatsakis
2 parents 2782202 + 59bb9c2 commit c53b4f3

File tree

1 file changed

+0
-19
lines changed

1 file changed

+0
-19
lines changed

src/rt/rust_util.h

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,6 @@ extern struct type_desc str_body_tydesc;
1919

2020
// Inline fn used regularly elsewhere.
2121

22-
static inline size_t
23-
next_power_of_two(size_t s)
24-
{
25-
size_t tmp = s - 1;
26-
tmp |= tmp >> 1;
27-
tmp |= tmp >> 2;
28-
tmp |= tmp >> 4;
29-
tmp |= tmp >> 8;
30-
tmp |= tmp >> 16;
31-
#ifdef _LP64
32-
tmp |= tmp >> 32;
33-
#endif
34-
return tmp + 1;
35-
}
36-
3722
// Rounds |size| to the nearest |alignment|. Invariant: |alignment| is a power
3823
// of two.
3924
template<typename T>
@@ -91,10 +76,6 @@ inline void reserve_vec_exact(rust_task* task, rust_vec_box** vpp,
9176
}
9277
}
9378

94-
inline void reserve_vec(rust_task* task, rust_vec_box** vpp, size_t size) {
95-
reserve_vec_exact(task, vpp, next_power_of_two(size));
96-
}
97-
9879
typedef rust_vec_box rust_str;
9980

10081
inline rust_str *

0 commit comments

Comments
 (0)