Auto merge of #7360 - wilmoz:ErgonomicSignature, r=Ms2ger

Make handle_potential_webgl_error more ergonomic

https://github.com/servo/servo/issues/7358

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7360)
<!-- Reviewable:end -->

1 files changed, 8 insertions, 5 deletions

diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index d9ed4d0d84c..c7f6ca54885 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -58,7 +58,10 @@ macro_rules! handle_potential_webgl_error {
                 $return_on_error
             }
         }
-    }
+    };
+    ($context:ident, $call:expr) => {
+        handle_potential_webgl_error!($context, $call, ());
+    };
 }
 
 /// Set of bitflags for texture unpacking (texImage2d, etc...)
@@ -268,7 +271,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
     fn AttachShader(self, program: Option<&WebGLProgram>, shader: Option<&WebGLShader>) {
         if let Some(program) = program {
             if let Some(shader) = shader {
-                handle_potential_webgl_error!(self, program.attach_shader(shader), ());
+                handle_potential_webgl_error!(self, program.attach_shader(shader));
             }
         }
     }
@@ -283,7 +286,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
         }
 
         if let Some(buffer) = buffer {
-            handle_potential_webgl_error!(self, buffer.bind(target), ())
+            handle_potential_webgl_error!(self, buffer.bind(target))
         } else {
             // Unbind the current buffer
             self.ipc_renderer
@@ -875,7 +878,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
                 if let Some(texture) = self.bound_texture_for(target) {
                     let texture = texture.root();
                     let result = texture.r().tex_parameter(target, name, TexParameterValue::Float(value));
-                    handle_potential_webgl_error!(self, result, ());
+                    handle_potential_webgl_error!(self, result);
                 } else {
                     return self.webgl_error(InvalidOperation);
                 }
@@ -893,7 +896,7 @@ impl<'a> WebGLRenderingContextMethods for &'a WebGLRenderingContext {
                 if let Some(texture) = self.bound_texture_for(target) {
                     let texture = texture.root();
                     let result = texture.r().tex_parameter(target, name, TexParameterValue::Int(value));
-                    handle_potential_webgl_error!(self, result, ());
+                    handle_potential_webgl_error!(self, result);
                 } else {
                     return self.webgl_error(InvalidOperation);
                 }