dnim/rust-postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update for transmute move

Browse Source
This commit is contained in:
Steven Fackler 2014-05-11 21:20:14 -07:00
parent d438521684
commit a720f39b08
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/types/array.rs
View File

@ -1,6 +1,6 @@
//! Multi-dimensional arrays with per-dimension specifiable lower bounds //! Multi-dimensional arrays with per-dimension specifiable lower bounds
use std::cast; use std::mem;
use std::slice; use std::slice;
/// Information about a dimension of an array /// Information about a dimension of an array
@ -228,7 +228,7 @@ impl<'parent, T> Array<T> for ArraySlice<'parent, T> {
"Attempted to slice a one-dimensional array"); "Attempted to slice a one-dimensional array");
unsafe { unsafe {
ArraySlice { ArraySlice {
parent: SliceParent(cast::transmute(self)), parent: SliceParent(mem::transmute(self)),
idx: self.shift_idx(idx), idx: self.shift_idx(idx),
} }
} }
@ -268,8 +268,8 @@ impl<'parent, T> Array<T> for MutArraySlice<'parent, T> {
fn dimension_info<'a>(&'a self) -> &'a [DimensionInfo] { fn dimension_info<'a>(&'a self) -> &'a [DimensionInfo] {
let info : &'a [DimensionInfo] = unsafe { let info : &'a [DimensionInfo] = unsafe {
match self.parent { match self.parent {
MutSliceMutParent(ref p) => cast::transmute(p.dimension_info()), MutSliceMutParent(ref p) => mem::transmute(p.dimension_info()),
MutBaseParent(ref p) => cast::transmute(p.dimension_info()), MutBaseParent(ref p) => mem::transmute(p.dimension_info()),
} }
}; };
info.slice_from(1) info.slice_from(1)
@ -280,7 +280,7 @@ impl<'parent, T> Array<T> for MutArraySlice<'parent, T> {
"Attempted to slice a one-dimensional array"); "Attempted to slice a one-dimensional array");
unsafe { unsafe {
ArraySlice { ArraySlice {
parent: MutSliceParent(cast::transmute(self)), parent: MutSliceParent(mem::transmute(self)),
idx: self.shift_idx(idx), idx: self.shift_idx(idx),
} }
} }
@ -300,7 +300,7 @@ impl<'parent, T> MutableArray<T> for MutArraySlice<'parent, T> {
unsafe { unsafe {
MutArraySlice { MutArraySlice {
idx: self.shift_idx(idx), idx: self.shift_idx(idx),
parent: MutSliceMutParent(cast::transmute(self)), parent: MutSliceMutParent(mem::transmute(self)),
} }
} }
} }
@ -319,8 +319,8 @@ impl<'parent, T> InternalArray<T> for MutArraySlice<'parent, T> {
let idx = size * self.idx + idx; let idx = size * self.idx + idx;
unsafe { unsafe {
match self.parent { match self.parent {
MutSliceMutParent(ref p) => cast::transmute(p.raw_get(idx, size)), MutSliceMutParent(ref p) => mem::transmute(p.raw_get(idx, size)),
MutBaseParent(ref p) => cast::transmute(p.raw_get(idx, size)) MutBaseParent(ref p) => mem::transmute(p.raw_get(idx, size))
} }
} }
} }
@ -332,8 +332,8 @@ impl<'parent, T> InternalMutableArray<T> for MutArraySlice<'parent, T> {
let idx = size * self.idx + idx; let idx = size * self.idx + idx;
unsafe { unsafe {
match self.parent { match self.parent {
MutSliceMutParent(ref mut p) => cast::transmute(p.raw_get_mut(idx, size)), MutSliceMutParent(ref mut p) => mem::transmute(p.raw_get_mut(idx, size)),
MutBaseParent(ref mut p) => cast::transmute(p.raw_get_mut(idx, size)) MutBaseParent(ref mut p) => mem::transmute(p.raw_get_mut(idx, size))
} }
} }
} }

2
submodules/rust-openssl

@ -1 +1 @@
Subproject commit 7bab60ddbe2aa9d242dc6d7c5cb840a9ccd874f7 Subproject commit 7e47bc8a4c13cd1c37d565a353406a59fa2fe047