Skip to content

Commit 78721a9

Browse files
borsbors
committed
---
yaml --- r: 146033 b: refs/heads/try2 c: cd623e3 h: refs/heads/master i: 146031: b25f346 v: v3
1 parent 3ce831d commit 78721a9

File tree

200 files changed

+843
-45092
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

200 files changed

+843
-45092
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 29c58c473f086af1c55f4a33ef9e6cbaa19ffdb1
8+
refs/heads/try2: cd623e3e36c1d59f4c8a528fc861a46ec46bd5ce
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
440440
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
441441
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
442442
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
443-
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
444443
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
445444
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
446445
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \

‎branches/try2/configure

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,6 @@ do
684684
make_dir $t/rt/libuv/src/ares
685685
make_dir $t/rt/libuv/src/eio
686686
make_dir $t/rt/libuv/src/ev
687-
make_dir $t/rt/jemalloc
688687
for i in \
689688
isaac sync test \
690689
arch/i386 arch/x86_64 arch/arm arch/mips \

‎branches/try2/doc/po/ja/rust.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ msgid ""
18421842
"The type parameters can also be explicitly supplied in a trailing [path]"
18431843
"(#paths) component after the function name. This might be necessary if there "
18441844
"is not sufficient context to determine the type parameters. For example, "
1845-
"`sys::size_of::<u32>() == 4`."
1845+
"`mem::size_of::<u32>() == 4`."
18461846
msgstr ""
18471847

18481848
#. type: Plain text

‎branches/try2/doc/po/ja/tutorial-ffi.md.po

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ msgid ""
327327
"impl<T: Send> Unique<T> {\n"
328328
" pub fn new(value: T) -> Unique<T> {\n"
329329
" unsafe {\n"
330-
" let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;\n"
330+
" let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;\n"
331331
" assert!(!ptr::is_null(ptr));\n"
332332
" // `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it\n"
333333
" intrinsics::move_val_init(&mut *ptr, value);\n"

‎branches/try2/doc/po/rust.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1842,7 +1842,7 @@ msgid ""
18421842
"The type parameters can also be explicitly supplied in a trailing [path]"
18431843
"(#paths) component after the function name. This might be necessary if there "
18441844
"is not sufficient context to determine the type parameters. For example, "
1845-
"`sys::size_of::<u32>() == 4`."
1845+
"`mem::size_of::<u32>() == 4`."
18461846
msgstr ""
18471847

18481848
#. type: Plain text

‎branches/try2/doc/po/tutorial-ffi.md.pot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ msgid ""
327327
"impl<T: Send> Unique<T> {\n"
328328
" pub fn new(value: T) -> Unique<T> {\n"
329329
" unsafe {\n"
330-
" let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;\n"
330+
" let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;\n"
331331
" assert!(!ptr::is_null(ptr));\n"
332332
" // `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it\n"
333333
" intrinsics::move_val_init(&mut *ptr, value);\n"

‎branches/try2/doc/rust.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,7 @@ with `int`, and require the closure parameter to have type
975975
The type parameters can also be explicitly supplied in a trailing
976976
[path](#paths) component after the function name. This might be necessary
977977
if there is not sufficient context to determine the type parameters. For
978-
example, `sys::size_of::<u32>() == 4`.
978+
example, `mem::size_of::<u32>() == 4`.
979979

980980
Since a parameter type is opaque to the generic function, the set of
981981
operations that can be performed on it is limited. Values of parameter
@@ -1589,7 +1589,7 @@ explain, here's a few use cases and what they would entail.
15891589
* A crate needs a global available "helper module" to itself, but it doesn't
15901590
want to expose the helper module as a public API. To accomplish this, the root
15911591
of the crate's hierarchy would have a private module which then internally has
1592-
a "public api". Because the entire crate is an ancestor of the root, then the
1592+
a "public api". Because the entire crate is a descendant of the root, then the
15931593
entire local crate can access this private module through the second case.
15941594

15951595
* When writing unit tests for a module, it's often a common idiom to have an
@@ -1602,7 +1602,10 @@ In the second case, it mentions that a private item "can be accessed" by the
16021602
current module and its descendants, but the exact meaning of accessing an item
16031603
depends on what the item is. Accessing a module, for example, would mean looking
16041604
inside of it (to import more items). On the other hand, accessing a function
1605-
would mean that it is invoked.
1605+
would mean that it is invoked. Additionally, path expressions and import
1606+
statements are considered to access an item in the sense that the
1607+
import/expression is only valid if the destination is in the current visibility
1608+
scope.
16061609

16071610
Here's an example of a program which exemplifies the three cases outlined above.
16081611

‎branches/try2/doc/tutorial-ffi.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ impl<T: Send> Unique<T> {
300300
#[inline(never)];
301301
302302
unsafe {
303-
let ptr = malloc(std::sys::size_of::<T>() as size_t) as *mut T;
303+
let ptr = malloc(std::mem::size_of::<T>() as size_t) as *mut T;
304304
assert!(!ptr::is_null(ptr));
305305
// `*ptr` is uninitialized, and `*ptr = value` would attempt to destroy it
306306
intrinsics::move_val_init(&mut *ptr, value);

‎branches/try2/mk/rt.mk

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -145,10 +145,10 @@ $$(RT_BUILD_DIR_$(1)_$(2))/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$
145145
$$(Q)$(AR_$(1)) rcs $$@ $$<
146146

147147
$$(RT_BUILD_DIR_$(1)_$(2))/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
148-
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)) $$(JEMALLOC_LIB_$(1))
148+
$$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1))
149149
@$$(call E, link: $$@)
150150
$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
151-
$$(JEMALLOC_LIB_$(1)) $$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(LIBUV_LIB_$(1)) \
151+
$$(LIBUV_LIB_$(1)) \
152152
$$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
153153

154154
# These could go in rt.mk or rustllvm.mk, they're needed for both.
@@ -197,27 +197,22 @@ define DEF_THIRD_PARTY_TARGETS
197197
# $(1) is the target triple
198198

199199
RT_OUTPUT_DIR_$(1) := $(1)/rt
200-
JEMALLOC_TARGET_$(1) := jemalloc_pic
201200

202201
ifeq ($$(CFG_WINDOWSY_$(1)), 1)
203202
LIBUV_OSTYPE_$(1) := win
204-
JEMALLOC_TARGET_$(1) := jemalloc
205203
else ifeq ($(OSTYPE_$(1)), apple-darwin)
206204
LIBUV_OSTYPE_$(1) := mac
207205
else ifeq ($(OSTYPE_$(1)), unknown-freebsd)
208206
LIBUV_OSTYPE_$(1) := freebsd
209207
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
210208
LIBUV_OSTYPE_$(1) := android
211-
JEMALLOC_ARGS_$(1) := --disable-tls
212209
LIBUV_ARGS_$(1) := PLATFORM=android host=android OS=linux
213210
else
214211
LIBUV_OSTYPE_$(1) := linux
215212
endif
216213

217214
LIBUV_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),uv)
218215
LIBUV_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/libuv/$$(LIBUV_NAME_$(1))
219-
JEMALLOC_NAME_$(1) := $$(call CFG_STATIC_LIB_NAME_$(1),$$(JEMALLOC_TARGET_$(1)))
220-
JEMALLOC_LIB_$(1) := $$(RT_OUTPUT_DIR_$(1))/jemalloc/lib/$$(JEMALLOC_NAME_$(1))
221216

222217
LIBUV_MAKEFILE_$(1) := $$(CFG_BUILD_DIR)$$(RT_OUTPUT_DIR_$(1))/libuv/Makefile
223218

@@ -253,16 +248,6 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS) $$(LIBUV_MAKEFILE_$(1))
253248
V=$$(VERBOSE)
254249
endif
255250

256-
$$(JEMALLOC_LIB_$(1)):
257-
cd $$(RT_OUTPUT_DIR_$(1))/jemalloc; $(S)src/rt/jemalloc/configure \
258-
$$(JEMALLOC_ARGS_$(1)) \
259-
--disable-experimental --build=$(CFG_BUILD_TRIPLE) --host=$(1) \
260-
EXTRA_CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
261-
CC="$$(CC_$(1))" \
262-
CXX="$$(CXX_$(1))" \
263-
AR="$$(AR_$(1))"
264-
$$(Q)$$(MAKE) -C $$(RT_OUTPUT_DIR_$(1))/jemalloc build_lib_static
265-
266251
endef
267252

268253
# Instantiate template for all stages/targets

‎branches/try2/mk/tests.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@ tidy:
265265
| grep '^$(S)src/libuv' -v \
266266
| grep '^$(S)src/gyp' -v \
267267
| grep '^$(S)src/etc' -v \
268-
| grep '^$(S)src/rt/jemalloc' -v \
269268
| xargs $(CFG_PYTHON) $(S)src/etc/check-binaries.py
270269

271270
endif

‎branches/try2/src/etc/gedit/share/gtksourceview-3.0/language-specs/rust.lang

Lines changed: 46 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@
8585
<keyword>u64</keyword>
8686
<keyword>f32</keyword>
8787
<keyword>f64</keyword>
88-
<keyword>float</keyword>
8988
<keyword>char</keyword>
9089
<keyword>str</keyword>
9190
<keyword>Either</keyword>
@@ -205,16 +204,36 @@
205204
</include>
206205
</context>
207206

207+
<define-regex id="int_suffix" extended="true">
208+
(i8|i16|i32|i64|i|u8|u16|u32|u64|u)
209+
</define-regex>
210+
211+
<define-regex id="exponent" extended="true">
212+
([eE][+-]?[0-9_]+)
213+
</define-regex>
214+
215+
<define-regex id="float_suffix" extended="true">
216+
(\%{exponent}?(f32|f64)?)|(\.[0-9][0-9_]*\%{exponent}?)?(f32|f64)?|\.
217+
</define-regex>
218+
219+
<define-regex id="num_suffix" extended="true">
220+
\%{int_suffix}|\%{float_suffix}
221+
</define-regex>
222+
223+
<define-regex id="hex_digit" extended="true">
224+
[0-9a-fA-F]
225+
</define-regex>
226+
208227
<context id="number" style-ref="number">
209228
<match extended="true">
210-
(?&lt;![\w\.])
229+
((?&lt;=\.\.)|(?&lt;![\w\.]))
211230
(
212-
0x[0-9a-fA-F_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?|
213-
0b[0-1_]+(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?|
214-
[0-9][0-9_]*\.[0-9_]*([eE][+-]?[0-9_]+)?(f32|f64|f)?|
215-
[0-9][0-9_]*(u8|u16|u32|u64|i8|i16|i32|i64|u|i)?
231+
[1-9][0-9_]*\%{num_suffix}?|
232+
0[0-9_]*\%{num_suffix}?|
233+
0b[01_]+\%{int_suffix}?|
234+
0x(\%{hex_digit}|_)+\%{int_suffix}?
216235
)
217-
(?![\w\.])
236+
((?![\w\.].)|(?=\.\.))
218237
</match>
219238
</context>
220239

@@ -234,32 +253,37 @@
234253
</match>
235254
</context>
236255

256+
<define-regex id="common_escape" extended="true">
257+
'|"|
258+
\\|n|r|t|
259+
x\%{hex_digit}{2}|
260+
u\%{hex_digit}{4}|
261+
U\%{hex_digit}{8}
262+
</define-regex>
263+
264+
<context id="string_escape" style-ref="def:special-char">
265+
<match>\\\%{common_escape}</match>
266+
</context>
267+
237268
<context id="string" style-ref="string" class="string" class-disabled="no-spell-check">
238269
<start>"</start>
239270
<end>"</end>
240271
<include>
241-
<context ref="def:escape"/>
272+
<context ref="string_escape"/>
242273
<context ref="def:line-continue"/>
243274
</include>
244275
</context>
245276

246-
<define-regex id="hex_digit" extended="true">
247-
[0-9a-fA-F]
248-
</define-regex>
249-
250-
<define-regex id="common_escape" extended="true">
251-
(n|r|t)|
252-
x\%{hex_digit}{2}|
253-
u\%{hex_digit}{4}|
254-
U\%{hex_digit}{8}
255-
</define-regex>
256-
257-
<context id="char" style-ref="char" class="char">
258-
<match extended="true">'([^\\]|\\\%{common_escape})'</match>
277+
<context id="char" style-ref="char">
278+
<match extended="true">'([^\\']|\\\%{common_escape})'</match>
259279
</context>
260280

261281
<context id="attribute" style-ref="attribute" class="attribute">
262-
<match extended="true">\#\[[^\]]+\]</match>
282+
<start extended="true">\#\[</start>
283+
<end>\]</end>
284+
<include>
285+
<context ref="def:in-comment"/>
286+
</include>
263287
</context>
264288

265289
<context id="rust" class="no-spell-check">

‎branches/try2/src/etc/vim/syntax/rust.vim

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" Maintainer: Patrick Walton <[email protected]>
44
" Maintainer: Ben Blum <[email protected]>
55
" Maintainer: Chris Morgan <[email protected]>
6-
" Last Change: 2013 Sep 4
6+
" Last Change: 2013 Oct 19
77

88
if version < 600
99
syntax clear
@@ -61,6 +61,7 @@ syn keyword rustEnumVariant Ok Err
6161
" Functions {{{3
6262
"syn keyword rustFunction print println
6363
"syn keyword rustFunction range
64+
"syn keyword rustFunction from_str
6465

6566
" Types and traits {{{3
6667
syn keyword rustTrait ToCStr
@@ -79,22 +80,23 @@ syn keyword rustTrait Orderable Signed Unsigned Round
7980
syn keyword rustTrait Algebraic Trigonometric Exponential Hyperbolic
8081
syn keyword rustTrait Integer Fractional Real RealExt
8182
syn keyword rustTrait Bitwise BitCount Bounded
82-
syn keyword rustTrait Primitive Int Float ToStrRadix
83+
syn keyword rustTrait Primitive Int Float ToStrRadix ToPrimitive FromPrimitive
8384
syn keyword rustTrait GenericPath
8485
syn keyword rustTrait Path
8586
syn keyword rustTrait PosixPath
8687
syn keyword rustTrait WindowsPath
8788
syn keyword rustTrait RawPtr
8889
syn keyword rustTrait Ascii AsciiCast OwnedAsciiCast AsciiStr ToBytesConsume
90+
syn keyword rustTrait SendStr SendStrOwned SendStrStatic IntoSendStr
8991
syn keyword rustTrait Str StrVector StrSlice OwnedStr
9092
syn keyword rustTrait FromStr
9193
syn keyword rustTrait IterBytes
9294
syn keyword rustTrait ToStr ToStrConsume
9395
syn keyword rustTrait CopyableTuple ImmutableTuple
94-
syn keyword rustTrait CloneableTuple1 ImmutableTuple1
95-
syn keyword rustTrait CloneableTuple2 CloneableTuple3 CloneableTuple4 CloneableTuple5
96-
syn keyword rustTrait CloneableTuple6 CloneableTuple7 CloneableTuple8 CloneableTuple9
97-
syn keyword rustTrait CloneableTuple10 CloneableTuple11 CloneableTuple12
96+
syn keyword rustTrait Tuple1 ImmutableTuple1
97+
syn keyword rustTrait Tuple2 Tuple3 Tuple4 Tuple5
98+
syn keyword rustTrait Tuple6 Tuple7 Tuple8 Tuple9
99+
syn keyword rustTrait Tuple10 Tuple11 Tuple12
98100
syn keyword rustTrait ImmutableTuple2 ImmutableTuple3 ImmutableTuple4 ImmutableTuple5
99101
syn keyword rustTrait ImmutableTuple6 ImmutableTuple7 ImmutableTuple8 ImmutableTuple9
100102
syn keyword rustTrait ImmutableTuple10 ImmutableTuple11 ImmutableTuple12
@@ -145,7 +147,7 @@ syn match rustMacro '#\w\(\w\)*' contains=rustAssert,rustFail
145147

146148
syn match rustFormat display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn?]\|\[\^\=.[^]]*\]\)" contained
147149
syn match rustFormat display "%%" contained
148-
syn match rustSpecial display contained /\\\([nrt\\'"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)/
150+
syn match rustSpecial display contained /\\\([nrt0\\'"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)/
149151
syn match rustStringContinuation display contained /\\\n\s*/
150152
syn region rustString start=+"+ skip=+\\\\\|\\"+ end=+"+ contains=rustTodo,rustFormat,rustSpecial,rustStringContinuation
151153
syn region rustString start='r\z(#*\)"' end='"\z1'
@@ -174,13 +176,13 @@ syn match rustFloat display "\<[0-9][0-9_]*\.[0-9_]\+\%([eE][+-]\=[0-9
174176
syn match rustFloat display "\<[0-9][0-9_]*\.[0-9_]\+\%([eE][+-]\=[0-9_]\+\)\(f\|f32\|f64\)\>"
175177

176178
" For the benefit of delimitMate
177-
syn region rustLifetimeCandidate display start=/&'\%(\([^'\\]\|\\\(['nrt\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'\)\@!/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
179+
syn region rustLifetimeCandidate display start=/&'\%(\([^'\\]\|\\\(['nrt0\\\"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'\)\@!/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
178180
syn region rustGenericRegion display start=/<\%('\|[^[cntrl:][:space:][:punct:]]\)\@=')\S\@=/ end=/>/ contains=rustGenericLifetimeCandidate
179181
syn region rustGenericLifetimeCandidate display start=/\%(<\|,\s*\)\@<='/ end=/[[:cntrl:][:space:][:punct:]]\@=\|$/ contains=rustSigil,rustLifetime
180182

181183
"rustLifetime must appear before rustCharacter, or chars will get the lifetime highlighting
182184
syn match rustLifetime display "\'\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*"
183-
syn match rustCharacter /'\([^'\\]\|\\\([nrt\\'"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'/ contains=rustSpecial
185+
syn match rustCharacter /'\([^'\\]\|\\\([nrt0\\'"]\|x\x\{2}\|u\x\{4}\|U\x\{8}\)\)'/ contains=rustSpecial
184186

185187
syn region rustCommentML start="/\*" end="\*/" contains=rustTodo
186188
syn region rustComment start="//" end="$" contains=rustTodo keepend

‎branches/try2/src/libextra/arc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -823,7 +823,7 @@ mod tests {
823823
do 5.times {
824824
let arc3 = arc.clone();
825825
let mut builder = task::task();
826-
builder.future_result(|r| children.push(r));
826+
children.push(builder.future_result());
827827
do builder.spawn {
828828
do arc3.read |num| {
829829
assert!(*num >= 0);

‎branches/try2/src/libextra/arena.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ use std::cast::{transmute, transmute_mut, transmute_mut_region};
4242
use std::cast;
4343
use std::num;
4444
use std::ptr;
45-
use std::sys;
45+
use std::mem;
4646
use std::uint;
4747
use std::vec;
4848
use std::unstable::intrinsics;
@@ -123,7 +123,7 @@ unsafe fn destroy_chunk(chunk: &Chunk) {
123123
let (tydesc, is_done) = un_bitpack_tydesc_ptr(*tydesc_data);
124124
let (size, align) = ((*tydesc).size, (*tydesc).align);
125125

126-
let after_tydesc = idx + sys::size_of::<*TyDesc>();
126+
let after_tydesc = idx + mem::size_of::<*TyDesc>();
127127

128128
let start = round_up_to(after_tydesc, align);
129129

@@ -134,7 +134,7 @@ unsafe fn destroy_chunk(chunk: &Chunk) {
134134
}
135135

136136
// Find where the next tydesc lives
137-
idx = round_up_to(start + size, sys::pref_align_of::<*TyDesc>());
137+
idx = round_up_to(start + size, mem::pref_align_of::<*TyDesc>());
138138
}
139139
}
140140

@@ -220,7 +220,7 @@ impl Arena {
220220
let head = transmute_mut_region(&mut self.head);
221221

222222
tydesc_start = head.fill;
223-
after_tydesc = head.fill + sys::size_of::<*TyDesc>();
223+
after_tydesc = head.fill + mem::size_of::<*TyDesc>();
224224
start = round_up_to(after_tydesc, align);
225225
end = start + n_bytes;
226226
}
@@ -230,7 +230,7 @@ impl Arena {
230230
}
231231

232232
let head = transmute_mut_region(&mut self.head);
233-
head.fill = round_up_to(end, sys::pref_align_of::<*TyDesc>());
233+
head.fill = round_up_to(end, mem::pref_align_of::<*TyDesc>());
234234

235235
//debug2!("idx = {}, size = {}, align = {}, fill = {}",
236236
// start, n_bytes, align, head.fill);

0 commit comments

Comments
 (0)