nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

std::vec::raw: convert copy_memory to a method.

Browse Source
This commit is contained in:
Huon Wilson 2013-12-16 23:35:02 +11:00
parent ad20a78c54
commit d0ae820765
2 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libextra/uuid.rs
View File

@ -219,9 +219,7 @@ impl Uuid {
}
let mut uuid = Uuid{ bytes: [0, .. 16] };
unsafe {
vec::raw::copy_memory(uuid.bytes, b);
}
vec::bytes::copy_memory(uuid.bytes, b);
Some(uuid)
}

41
src/libstd/vec.rs
View File

@ -2060,6 +2060,12 @@ pub trait MutableVector<'a, T> {
*/
unsafe fn init_elem(self, i: uint, val: T);
/// Copies data from `src` to `self`
///
/// `self` and `src` must not overlap. Fails if `self` is
/// shorter than `src`.
unsafe fn copy_memory(self, src: &[T]);
/// Similar to `as_imm_buf` but passing a `*mut T`
fn as_mut_buf<U>(self, f: |*mut T, uint| -> U) -> U;
}
@ -2197,6 +2203,16 @@ impl<'a,T> MutableVector<'a, T> for &'a mut [T] {
})
}
#[inline]
unsafe fn copy_memory(self, src: &[T]) {
self.as_mut_buf(|p_dst, len_dst| {
src.as_imm_buf(|p_src, len_src| {
assert!(len_dst >= len_src)
ptr::copy_memory(p_dst, p_src, len_src)
})
})
}
#[inline]
fn as_mut_buf<U>(self, f: |*mut T, uint| -> U) -> U {
let Slice{ data, len } = self.repr();
@ -2238,7 +2254,7 @@ pub unsafe fn from_buf<T>(ptr: *T, elts: uint) -> ~[T] {
pub mod raw {
use cast;
use ptr;
use vec::{with_capacity, ImmutableVector, MutableVector};
use vec::{with_capacity, MutableVector};
use unstable::raw::Slice;
/**
@ -2288,21 +2304,6 @@ pub mod raw {
dst
}
/**
* Copies data from one vector to another.
*
* Copies `src` to `dst`. The source and destination may overlap.
*/
#[inline]
pub unsafe fn copy_memory<T>(dst: &mut [T], src: &[T]) {
dst.as_mut_buf(|p_dst, len_dst| {
src.as_imm_buf(|p_src, len_src| {
assert!(len_dst >= len_src)
ptr::copy_memory(p_dst, p_src, len_src)
})
})
}
/**
* Returns a pointer to first element in slice and adjusts
* slice so it no longer contains that element. Fails if
@ -2331,7 +2332,7 @@ pub mod raw {
/// Operations on `[u8]`.
pub mod bytes {
use vec::raw;
use vec::MutableVector;
use ptr;
/// A trait for operations on mutable `[u8]`s.
@ -2358,8 +2359,8 @@ pub mod bytes {
*/
#[inline]
pub fn copy_memory(dst: &mut [u8], src: &[u8]) {
// Bound checks are done at vec::raw::copy_memory.
unsafe { raw::copy_memory(dst, src) }
// Bound checks are done at .copy_memory.
unsafe { dst.copy_memory(src) }
}
/**
@ -3585,7 +3586,7 @@ mod tests {
unsafe {
let mut a = [1, 2, 3, 4];
let b = [1, 2, 3, 4, 5];
raw::copy_memory(a, b);
a.copy_memory(b);
}
}