OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor changes in std::mem

Browse Source 
Fixed a typo in the documentation of std::mem, and refactored a function to use match instead of if.

Also added a FIXME to the benchmarks at the end of the file stating that they should be moved to another place, because they have nothing to do with `mem` (see https://github.com/mozilla/rust/issues/13642)
This commit is contained in:
aochagavia 2014-04-16 10:53:09 +02:00 committed by Adolfo Ochagavía
parent d35804ea5e
commit e36adee3ae
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libstd/mem.rs
View File

@ -37,8 +37,10 @@ pub fn size_of_val<T>(_val: &T) -> uint {
/// Useful for building structures containing variable-length arrays. /// Useful for building structures containing variable-length arrays.
#[inline] #[inline]
pub fn nonzero_size_of<T>() -> uint { pub fn nonzero_size_of<T>() -> uint {
let s = size_of::<T>(); match size_of::<T>() {
if s == 0 { 1 } else { s } 0 => 1,
x => x
}
} }
/// Returns the size in bytes of the type of the value that `_val` points to. /// Returns the size in bytes of the type of the value that `_val` points to.
@ -222,7 +224,6 @@ pub unsafe fn move_val_init<T>(dst: &mut T, src: T) {
/// On big endian, this is a no-op. On little endian, the bytes are swapped. /// On big endian, this is a no-op. On little endian, the bytes are swapped.
#[cfg(target_endian = "big")] #[inline] pub fn from_be64(x: u64) -> u64 { x } #[cfg(target_endian = "big")] #[inline] pub fn from_be64(x: u64) -> u64 { x }
/** /**
* Swap the values at two mutable locations of the same type, without * Swap the values at two mutable locations of the same type, without
* deinitialising or copying either one. * deinitialising or copying either one.
@ -238,7 +239,7 @@ pub fn swap<T>(x: &mut T, y: &mut T) {
ptr::copy_nonoverlapping_memory(x, &*y, 1); ptr::copy_nonoverlapping_memory(x, &*y, 1);
ptr::copy_nonoverlapping_memory(y, &t, 1); ptr::copy_nonoverlapping_memory(y, &t, 1);
// y and t now point to the same thing, but we need to completely forget `tmp` // y and t now point to the same thing, but we need to completely forget `t`
// because it's no longer relevant. // because it's no longer relevant.
cast::forget(t); cast::forget(t);
} }
@ -359,6 +360,7 @@ mod tests {
} }
} }
// FIXME #13642 (these benchmarks should be in another place)
/// Completely miscellaneous language-construct benchmarks. /// Completely miscellaneous language-construct benchmarks.
#[cfg(test)] #[cfg(test)]
mod bench { mod bench {