diff options
| author | Nick Cameron <ncameron@mozilla.com> | 2015-01-07 17:26:55 +1300 |
|---|---|---|
| committer | Nick Cameron <ncameron@mozilla.com> | 2015-01-08 09:07:55 +1300 |
| commit | dd3e89aaf25c667fa8207f8800c4b60d70d76c1b (patch) | |
| tree | e22fee6b3c1b88bb3d247e89e0349a1781849f74 /src/libcore/num | |
| parent | 9f1ead8fadc56bad30dc74f5cc50d78af4fbc972 (diff) | |
| download | rust-dd3e89aaf25c667fa8207f8800c4b60d70d76c1b.tar.gz rust-dd3e89aaf25c667fa8207f8800c4b60d70d76c1b.zip | |
Rename `target_word_size` to `target_pointer_width`
Closes #20421 [breaking-change]
Diffstat (limited to 'src/libcore/num')
| -rw-r--r-- | src/libcore/num/int.rs | 7 | ||||
| -rw-r--r-- | src/libcore/num/mod.rs | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/libcore/num/int.rs b/src/libcore/num/int.rs index 91c5e4163f9..93f5b31ca72 100644 --- a/src/libcore/num/int.rs +++ b/src/libcore/num/int.rs @@ -13,5 +13,8 @@ #![stable] #![doc(primitive = "int")] -#[cfg(target_word_size = "32")] int_module! { int, 32 } -#[cfg(target_word_size = "64")] int_module! { int, 64 } +#[cfg(stage0)] #[cfg(target_word_size = "32")] int_module! { int, 32 } +#[cfg(stage0)] #[cfg(target_word_size = "64")] int_module! { int, 64 } + +#[cfg(not(stage0))] #[cfg(target_pointer_width = "32")] int_module! { int, 32 } +#[cfg(not(stage0))] #[cfg(target_pointer_width = "64")] int_module! { int, 64 } diff --git a/src/libcore/num/mod.rs b/src/libcore/num/mod.rs index 490d8111f46..47da5de5391 100644 --- a/src/libcore/num/mod.rs +++ b/src/libcore/num/mod.rs @@ -496,7 +496,7 @@ uint_impl! { u64 = u64, 64, intrinsics::u64_sub_with_overflow, intrinsics::u64_mul_with_overflow } -#[cfg(target_word_size = "32")] +#[cfg(any(all(stage0, target_word_size = "32"), all(not(stage0), target_pointer_width = "32")))] uint_impl! { uint = u32, 32, intrinsics::ctpop32, intrinsics::ctlz32, @@ -506,7 +506,7 @@ uint_impl! { uint = u32, 32, intrinsics::u32_sub_with_overflow, intrinsics::u32_mul_with_overflow } -#[cfg(target_word_size = "64")] +#[cfg(any(all(stage0, target_word_size = "64"), all(not(stage0), target_pointer_width = "64")))] uint_impl! { uint = u64, 64, intrinsics::ctpop64, intrinsics::ctlz64, @@ -601,13 +601,13 @@ int_impl! { i64 = i64, u64, 64, intrinsics::i64_sub_with_overflow, intrinsics::i64_mul_with_overflow } -#[cfg(target_word_size = "32")] +#[cfg(any(all(stage0, target_word_size = "32"), all(not(stage0), target_pointer_width = "32")))] int_impl! { int = i32, u32, 32, intrinsics::i32_add_with_overflow, intrinsics::i32_sub_with_overflow, intrinsics::i32_mul_with_overflow } -#[cfg(target_word_size = "64")] +#[cfg(any(all(stage0, target_word_size = "64"), all(not(stage0), target_pointer_width = "64")))] int_impl! { int = i64, u64, 64, intrinsics::i64_add_with_overflow, intrinsics::i64_sub_with_overflow, |