Auto merge of #32066 - ruud-v-a:fma, r=alexcrichton

[rust.git] / src / librustc_back / abi.rs

diff --git a/src/librustc_back/abi.rs b/src/librustc_back/abi.rs
index 2f6efbc85a2647f1e6f588d4171a564f394a1696..c3a3a8d582aff91f2fc400141e0b57d16d605234 100644 (file)
--- a/src/librustc_back/abi.rs
+++ b/src/librustc_back/abi.rs
@@ -8,17 +8,17 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub const BOX_FIELD_DROP_GLUE: uint = 1u;
-pub const BOX_FIELD_BODY: uint = 4u;
+pub const BOX_FIELD_DROP_GLUE: usize = 1;
+pub const BOX_FIELD_BODY: usize = 4;
 
 /// The first half of a fat pointer.
 /// - For a closure, this is the code address.
 /// - For an object or trait instance, this is the address of the box.
 /// - For a slice, this is the base address.
-pub const FAT_PTR_ADDR: uint = 0;
+pub const FAT_PTR_ADDR: usize = 0;
 
 /// The second half of a fat pointer.
 /// - For a closure, this is the address of the environment.
 /// - For an object or trait instance, this is the address of the vtable.
 /// - For a slice, this is the length.
-pub const FAT_PTR_EXTRA: uint = 1u;
+pub const FAT_PTR_EXTRA: usize = 1;