diff options
| author | bors <bors@rust-lang.org> | 2014-02-24 14:37:01 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-24 14:37:01 -0800 |
| commit | b48bc9ec935f6c87d16628b026cc4b9c99746b94 (patch) | |
| tree | acf90ab35a460176c2e308fbc0dc8b250bdb7b11 /src/libstd | |
| parent | 68a4f7d9babb0c638f3425ced08e13f9fbfdcf56 (diff) | |
| parent | 9e8d5aa29e40066b9c247ef252b58c2092ecdfae (diff) | |
| download | rust-b48bc9ec935f6c87d16628b026cc4b9c99746b94.tar.gz rust-b48bc9ec935f6c87d16628b026cc4b9c99746b94.zip | |
auto merge of #12445 : huonw/rust/less-unsafe, r=alexcrichton
Commits for details. Highlights: - `flate` returns `CVec<u8>` to save reallocating a whole new `&[u8]` - a lot of `transmute`s removed outright or replaced with `as` (etc.)
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/num/f32.rs | 6 | ||||
| -rw-r--r-- | src/libstd/num/f64.rs | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/libstd/num/f32.rs b/src/libstd/num/f32.rs index a4eac564ee6..a98fd31c457 100644 --- a/src/libstd/num/f32.rs +++ b/src/libstd/num/f32.rs @@ -350,10 +350,8 @@ impl Float for f32 { static EXP_MASK: u32 = 0x7f800000; static MAN_MASK: u32 = 0x007fffff; - match ( - unsafe { ::cast::transmute::<f32,u32>(*self) } & MAN_MASK, - unsafe { ::cast::transmute::<f32,u32>(*self) } & EXP_MASK, - ) { + let bits: u32 = unsafe {::cast::transmute(*self)}; + match (bits & MAN_MASK, bits & EXP_MASK) { (0, 0) => FPZero, (_, 0) => FPSubnormal, (0, EXP_MASK) => FPInfinite, diff --git a/src/libstd/num/f64.rs b/src/libstd/num/f64.rs index e6b903cbbdb..5975ce40d84 100644 --- a/src/libstd/num/f64.rs +++ b/src/libstd/num/f64.rs @@ -352,10 +352,8 @@ impl Float for f64 { static EXP_MASK: u64 = 0x7ff0000000000000; static MAN_MASK: u64 = 0x000fffffffffffff; - match ( - unsafe { ::cast::transmute::<f64,u64>(*self) } & MAN_MASK, - unsafe { ::cast::transmute::<f64,u64>(*self) } & EXP_MASK, - ) { + let bits: u64 = unsafe {::cast::transmute(*self)}; + match (bits & MAN_MASK, bits & EXP_MASK) { (0, 0) => FPZero, (_, 0) => FPSubnormal, (0, EXP_MASK) => FPInfinite, |