about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-24 14:37:01 -0800
committerbors <bors@rust-lang.org>2014-02-24 14:37:01 -0800
commitb48bc9ec935f6c87d16628b026cc4b9c99746b94 (patch)
treeacf90ab35a460176c2e308fbc0dc8b250bdb7b11 /src/libserialize
parent68a4f7d9babb0c638f3425ced08e13f9fbfdcf56 (diff)
parent9e8d5aa29e40066b9c247ef252b58c2092ecdfae (diff)
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/libserialize')
-rw-r--r--src/libserialize/ebml.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/libserialize/ebml.rs b/src/libserialize/ebml.rs
index b7e1e5a8da7..bc9eee51753 100644
--- a/src/libserialize/ebml.rs
+++ b/src/libserialize/ebml.rs
@@ -161,9 +161,7 @@ pub mod reader {
         ];
 
         unsafe {
-            let (ptr, _): (*u8, uint) = transmute(data);
-            let ptr = ptr.offset(start as int);
-            let ptr: *i32 = transmute(ptr);
+            let ptr = data.as_ptr().offset(start as int) as *i32;
             let val = from_be32(*ptr) as u32;
 
             let i = (val >> 28u) as uint;