Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Refactor if let Some(a) { Some(b) } else { None }

Browse source 
Prefer `Option::map` instead.
This commit is contained in:
Emilio Cobos Álvarez 2015-09-25 16:29:23 +02:00
parent 5d7d745ab4
commit d12dbf94f2
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/script/dom/htmlcanvaselement.rs
View file

@ -114,27 +114,23 @@ impl LayoutHTMLCanvasElementHelpers for LayoutJS<HTMLCanvasElement> {
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_renderer_id(&self) -> Option<usize> { unsafe fn get_renderer_id(&self) -> Option<usize> {
let ref canvas = *self.unsafe_get(); let ref canvas = *self.unsafe_get();
if let Some(context) = canvas.context.get() { canvas.context.get().map(|context| {
match context { match context {
CanvasContext::Context2d(context) => Some(context.to_layout().get_renderer_id()), CanvasContext::Context2d(context) => context.to_layout().get_renderer_id(),
CanvasContext::WebGL(context) => Some(context.to_layout().get_renderer_id()), CanvasContext::WebGL(context) => context.to_layout().get_renderer_id(),
} }
} else { })
None
}
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
unsafe fn get_ipc_renderer(&self) -> Option<IpcSender<CanvasMsg>> { unsafe fn get_ipc_renderer(&self) -> Option<IpcSender<CanvasMsg>> {
let ref canvas = *self.unsafe_get(); let ref canvas = *self.unsafe_get();
if let Some(context) = canvas.context.get() { canvas.context.get().map(|context| {
match context { match context {
CanvasContext::Context2d(context) => Some(context.to_layout().get_ipc_renderer()), CanvasContext::Context2d(context) => context.to_layout().get_ipc_renderer(),
CanvasContext::WebGL(context) => Some(context.to_layout().get_ipc_renderer()), CanvasContext::WebGL(context) => context.to_layout().get_ipc_renderer(),
} }
} else { })
None
}
} }
#[allow(unsafe_code)] #[allow(unsafe_code)]
@ -151,14 +147,12 @@ impl LayoutHTMLCanvasElementHelpers for LayoutJS<HTMLCanvasElement> {
impl HTMLCanvasElement { impl HTMLCanvasElement {
pub fn ipc_renderer(&self) -> Option<IpcSender<CanvasMsg>> { pub fn ipc_renderer(&self) -> Option<IpcSender<CanvasMsg>> {
if let Some(context) = self.context.get() { self.context.get().map(|context| {
match context { match context {
CanvasContext::Context2d(context) => Some(context.root().r().ipc_renderer()), CanvasContext::Context2d(context) => context.root().r().ipc_renderer(),
CanvasContext::WebGL(context) => Some(context.root().r().ipc_renderer()), CanvasContext::WebGL(context) => context.root().r().ipc_renderer(),
} }
} else { })
None
}
} }
pub fn get_or_init_2d_context(&self) -> Option<Root<CanvasRenderingContext2D>> { pub fn get_or_init_2d_context(&self) -> Option<Root<CanvasRenderingContext2D>> {