mask: update for actual Rust version

Closes #35

Signed-off-by: Alexey Galakhov <agalakhov@snapview.de>
pull/44/head
Alexey Galakhov 7 years ago
parent cb671e1abc
commit e4a52cde05
  1. 10
      src/protocol/frame/mask.rs

@ -1,6 +1,6 @@
use std::cmp::min; use std::cmp::min;
use std::mem::uninitialized; use std::mem::uninitialized;
use std::ptr::copy_nonoverlapping; use std::ptr::{copy_nonoverlapping, read_unaligned};
use rand; use rand;
/// Generate a random frame mask. /// Generate a random frame mask.
@ -28,12 +28,8 @@ fn apply_mask_fallback(buf: &mut [u8], mask: &[u8; 4]) {
#[inline] #[inline]
#[allow(dead_code)] #[allow(dead_code)]
fn apply_mask_fast32(buf: &mut [u8], mask: &[u8; 4]) { fn apply_mask_fast32(buf: &mut [u8], mask: &[u8; 4]) {
// TODO replace this with read_unaligned() as it stabilizes. let mask_u32: u32 = unsafe {
let mask_u32 = unsafe { read_unaligned(mask.as_ptr() as *const u32)
let mut m: u32 = uninitialized();
#[allow(trivial_casts)]
copy_nonoverlapping(mask.as_ptr(), &mut m as *mut _ as *mut u8, 4);
m
}; };
let mut ptr = buf.as_mut_ptr(); let mut ptr = buf.as_mut_ptr();

Loading…
Cancel
Save