diff options
-rw-r--r-- | components/canvas/canvas_paint_task.rs | 4 | ||||
-rw-r--r-- | components/canvas/webgl_paint_task.rs | 2 | ||||
-rw-r--r-- | components/layout/table_wrapper.rs | 2 | ||||
-rw-r--r-- | components/net/file_loader.rs | 2 | ||||
-rw-r--r-- | components/net/http_loader.rs | 2 | ||||
-rw-r--r-- | ports/gonk/src/input.rs | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs index 79dc45415c5..a13934413ba 100644 --- a/components/canvas/canvas_paint_task.rs +++ b/components/canvas/canvas_paint_task.rs @@ -516,7 +516,7 @@ impl<'a> CanvasPaintTask<'a> { let mut dest_data = self.read_pixels(dest_rect, canvas_size); // bgra -> rgba - byte_swap(dest_data.as_mut_slice()); + byte_swap(&mut dest_data); chan.send(dest_data).unwrap(); } @@ -530,7 +530,7 @@ impl<'a> CanvasPaintTask<'a> { assert!(image_data_rect.size.width * image_data_rect.size.height * 4.0 == imagedata.len() as f64); // rgba -> bgra - byte_swap(imagedata.as_mut_slice()); + byte_swap(&mut imagedata); let image_rect = Rect(Point2D(0f64, 0f64), Size2D(image_data_rect.size.width, image_data_rect.size.height)); diff --git a/components/canvas/webgl_paint_task.rs b/components/canvas/webgl_paint_task.rs index 1afcf20089c..eaa224c22b3 100644 --- a/components/canvas/webgl_paint_task.rs +++ b/components/canvas/webgl_paint_task.rs @@ -100,7 +100,7 @@ impl WebGLPaintTask { gl::RGBA, gl::UNSIGNED_BYTE); // rgba -> bgra - byte_swap(pixels.as_mut_slice()); + byte_swap(&mut pixels); chan.send(pixels).unwrap(); } diff --git a/components/layout/table_wrapper.rs b/components/layout/table_wrapper.rs index cfc2469e443..c603ff47476 100644 --- a/components/layout/table_wrapper.rs +++ b/components/layout/table_wrapper.rs @@ -288,7 +288,7 @@ impl Flow for TableWrapperFlow { TableLayout::Fixed => {} TableLayout::Auto => { self.calculate_table_column_sizes_for_automatic_layout( - intermediate_column_inline_sizes.as_mut_slice()) + &mut intermediate_column_inline_sizes) } } diff --git a/components/net/file_loader.rs b/components/net/file_loader.rs index c2a1d672bd7..9240a736862 100644 --- a/components/net/file_loader.rs +++ b/components/net/file_loader.rs @@ -23,7 +23,7 @@ enum ReadStatus { fn read_block(reader: &mut File) -> Result<ReadStatus, String> { let mut buf = vec![0; READ_SIZE]; - match reader.read(buf.as_mut_slice()) { + match reader.read(&mut buf) { Ok(0) => return Ok(ReadStatus::EOF), Ok(n) => { buf.truncate(n); diff --git a/components/net/http_loader.rs b/components/net/http_loader.rs index 0ac6980bb69..5081d9f8dcb 100644 --- a/components/net/http_loader.rs +++ b/components/net/http_loader.rs @@ -56,7 +56,7 @@ enum ReadResult { fn read_block<R: Read>(reader: &mut R) -> Result<ReadResult, ()> { let mut buf = vec![0; 1024]; - match reader.read(buf.as_mut_slice()) { + match reader.read(&mut buf) { Ok(len) if len > 0 => { unsafe { buf.set_len(len); } Ok(ReadResult::Payload(buf)) diff --git a/ports/gonk/src/input.rs b/ports/gonk/src/input.rs index 1ca7fd763f3..54e54b87784 100644 --- a/ports/gonk/src/input.rs +++ b/ports/gonk/src/input.rs @@ -139,7 +139,7 @@ fn read_input_device(device_path: &Path, // XXX: Need to use the real dimensions of the screen let screen_dist = dist(0, 480, 854, 0); loop { - let read = match device.read(buf.as_mut_slice()) { + let read = match device.read(&mut buf) { Ok(count) => { assert!(count % size_of::<linux_input_event>() == 0, "Unexpected input device read length!"); |