@@ -50,10 +50,10 @@ pub type GlueFn = extern "Rust" fn(*const i8);
50
50
#[ derive( Copy ) ]
51
51
pub struct TyDesc {
52
52
// sizeof(T)
53
- pub size : uint ,
53
+ pub size : usize ,
54
54
55
55
// alignof(T)
56
- pub align : uint ,
56
+ pub align : usize ,
57
57
58
58
// Called when a value of type `T` is no longer needed
59
59
pub drop_glue : GlueFn ,
@@ -186,15 +186,15 @@ extern "rust-intrinsic" {
186
186
/// would *exactly* overwrite a value. When laid out in vectors
187
187
/// and structures there may be additional padding between
188
188
/// elements.
189
- pub fn size_of < T > ( ) -> uint ;
189
+ pub fn size_of < T > ( ) -> usize ;
190
190
191
191
/// Move a value to an uninitialized memory location.
192
192
///
193
193
/// Drop glue is not run on the destination.
194
194
pub fn move_val_init < T > ( dst : & mut T , src : T ) ;
195
195
196
- pub fn min_align_of < T > ( ) -> uint ;
197
- pub fn pref_align_of < T > ( ) -> uint ;
196
+ pub fn min_align_of < T > ( ) -> usize ;
197
+ pub fn pref_align_of < T > ( ) -> usize ;
198
198
199
199
/// Get a static pointer to a type descriptor.
200
200
pub fn get_tydesc < T : ?Sized > ( ) -> * const TyDesc ;
@@ -253,7 +253,7 @@ extern "rust-intrinsic" {
253
253
///
254
254
/// This is implemented as an intrinsic to avoid converting to and from an
255
255
/// integer, since the conversion would throw away aliasing information.
256
- pub fn offset < T > ( dst : * const T , offset : int ) -> * const T ;
256
+ pub fn offset < T > ( dst : * const T , offset : isize ) -> * const T ;
257
257
258
258
/// Copies `count * size_of<T>` bytes from `src` to `dst`. The source
259
259
/// and destination may *not* overlap.
@@ -294,7 +294,7 @@ extern "rust-intrinsic" {
294
294
/// }
295
295
/// ```
296
296
#[ unstable( feature = "core" ) ]
297
- pub fn copy_nonoverlapping_memory < T > ( dst : * mut T , src : * const T , count : uint ) ;
297
+ pub fn copy_nonoverlapping_memory < T > ( dst : * mut T , src : * const T , count : usize ) ;
298
298
299
299
/// Copies `count * size_of<T>` bytes from `src` to `dst`. The source
300
300
/// and destination may overlap.
@@ -324,33 +324,33 @@ extern "rust-intrinsic" {
324
324
/// ```
325
325
///
326
326
#[ unstable( feature = "core" ) ]
327
- pub fn copy_memory < T > ( dst : * mut T , src : * const T , count : uint ) ;
327
+ pub fn copy_memory < T > ( dst : * mut T , src : * const T , count : usize ) ;
328
328
329
329
/// Invokes memset on the specified pointer, setting `count * size_of::<T>()`
330
330
/// bytes of memory starting at `dst` to `c`.
331
331
#[ unstable( feature = "core" ,
332
332
reason = "uncertain about naming and semantics" ) ]
333
- pub fn set_memory < T > ( dst : * mut T , val : u8 , count : uint ) ;
333
+ pub fn set_memory < T > ( dst : * mut T , val : u8 , count : usize ) ;
334
334
335
335
/// Equivalent to the appropriate `llvm.memcpy.p0i8.0i8.*` intrinsic, with
336
336
/// a size of `count` * `size_of::<T>()` and an alignment of
337
337
/// `min_align_of::<T>()`
338
338
///
339
339
/// The volatile parameter parameter is set to `true`, so it will not be optimized out.
340
340
pub fn volatile_copy_nonoverlapping_memory < T > ( dst : * mut T , src : * const T ,
341
- count : uint ) ;
341
+ count : usize ) ;
342
342
/// Equivalent to the appropriate `llvm.memmove.p0i8.0i8.*` intrinsic, with
343
343
/// a size of `count` * `size_of::<T>()` and an alignment of
344
344
/// `min_align_of::<T>()`
345
345
///
346
346
/// The volatile parameter parameter is set to `true`, so it will not be optimized out.
347
- pub fn volatile_copy_memory < T > ( dst : * mut T , src : * const T , count : uint ) ;
347
+ pub fn volatile_copy_memory < T > ( dst : * mut T , src : * const T , count : usize ) ;
348
348
/// Equivalent to the appropriate `llvm.memset.p0i8.*` intrinsic, with a
349
349
/// size of `count` * `size_of::<T>()` and an alignment of
350
350
/// `min_align_of::<T>()`.
351
351
///
352
352
/// The volatile parameter parameter is set to `true`, so it will not be optimized out.
353
- pub fn volatile_set_memory < T > ( dst : * mut T , val : u8 , count : uint ) ;
353
+ pub fn volatile_set_memory < T > ( dst : * mut T , val : u8 , count : usize ) ;
354
354
355
355
/// Perform a volatile load from the `src` pointer.
356
356
pub fn volatile_load < T > ( src : * const T ) -> T ;
0 commit comments