mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
clippy: Fix a few clippy problems in components/scripts/dom
(#31905)
* option_as_ref_deref * fix
This commit is contained in:
parent
1bc63801e7
commit
5aae820f6d
3 changed files with 10 additions and 12 deletions
|
@ -295,7 +295,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext
|
||||
fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option<f64>) {
|
||||
self.canvas_state
|
||||
.fill_text(self.canvas.as_ref().map(|c| &**c), text, x, y, max_width);
|
||||
.fill_text(self.canvas.as_deref(), text, x, y, max_width);
|
||||
self.mark_as_dirty();
|
||||
}
|
||||
|
||||
|
@ -311,8 +311,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-font
|
||||
fn SetFont(&self, value: DOMString) {
|
||||
self.canvas_state
|
||||
.set_font(self.canvas.as_ref().map(|c| &**c), value)
|
||||
self.canvas_state.set_font(self.canvas.as_deref(), value)
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-textalign
|
||||
|
@ -348,7 +347,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
|
||||
fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult {
|
||||
self.canvas_state
|
||||
.draw_image(self.canvas.as_ref().map(|c| &**c), image, dx, dy)
|
||||
.draw_image(self.canvas.as_deref(), image, dx, dy)
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
|
||||
|
@ -361,7 +360,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
dh: f64,
|
||||
) -> ErrorResult {
|
||||
self.canvas_state
|
||||
.draw_image_(self.canvas.as_ref().map(|c| &**c), image, dx, dy, dw, dh)
|
||||
.draw_image_(self.canvas.as_deref(), image, dx, dy, dw, dh)
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage
|
||||
|
@ -378,7 +377,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
dh: f64,
|
||||
) -> ErrorResult {
|
||||
self.canvas_state.draw_image__(
|
||||
self.canvas.as_ref().map(|c| &**c),
|
||||
self.canvas.as_deref(),
|
||||
image,
|
||||
sx,
|
||||
sy,
|
||||
|
@ -472,7 +471,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle
|
||||
fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern) {
|
||||
self.canvas_state
|
||||
.set_fill_style(self.canvas.as_ref().map(|c| &**c), value)
|
||||
.set_fill_style(self.canvas.as_deref(), value)
|
||||
}
|
||||
|
||||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata
|
||||
|
@ -653,7 +652,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
|
|||
// https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor
|
||||
fn SetShadowColor(&self, value: DOMString) {
|
||||
self.canvas_state
|
||||
.set_shadow_color(self.canvas.as_ref().map(|c| &**c), value)
|
||||
.set_shadow_color(self.canvas.as_deref(), value)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue