From 024323004d16b7415d9e90030c948bee0e12cd54 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 28 Apr 2015 19:25:46 +0200 Subject: [PATCH] Remove remaining as_slice / as_mut_slice calls. --- components/canvas/canvas_paint_task.rs | 2 +- components/script/dom/htmlcanvaselement.rs | 4 ++-- components/script/dom/htmlinputelement.rs | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/canvas/canvas_paint_task.rs b/components/canvas/canvas_paint_task.rs index a13934413ba..2740cdc330e 100644 --- a/components/canvas/canvas_paint_task.rs +++ b/components/canvas/canvas_paint_task.rs @@ -149,7 +149,7 @@ impl<'a> CanvasPaintTask<'a> { } let image_rect = Rect(Point2D(0f64, 0f64), image_size); // rgba -> bgra - byte_swap(imagedata.as_mut_slice()); + byte_swap(&mut imagedata); self.write_pixels(&imagedata, image_size, image_rect, dest_rect, smoothing_enabled); } diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index f4ce2ecfc13..47431248294 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -242,11 +242,11 @@ impl<'a> VirtualMethods for JSRef<'a, HTMLCanvasElement> { let value = attr.value(); let recreate = match attr.local_name() { &atom!("width") => { - self.width.set(parse_unsigned_integer(value.as_slice().chars()).unwrap_or(DEFAULT_WIDTH)); + self.width.set(parse_unsigned_integer(value.chars()).unwrap_or(DEFAULT_WIDTH)); true } &atom!("height") => { - self.height.set(parse_unsigned_integer(value.as_slice().chars()).unwrap_or(DEFAULT_HEIGHT)); + self.height.set(parse_unsigned_integer(value.chars()).unwrap_or(DEFAULT_HEIGHT)); true } _ => false, diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 379327d760a..17768a76c8b 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -854,7 +854,7 @@ impl<'a> Activatable for JSRef<'a, HTMLInputElement> { .filter_map(HTMLInputElementCast::to_temporary) .filter(|input| { let input = input.root(); - input.r().form_owner() == owner && match input.r().Type().as_slice() { + input.r().form_owner() == owner && match &*input.r().Type() { "text" | "search" | "url" | "tel" | "email" | "password" | "datetime" | "date" | "month" | "week" | "time" |