From 7a774a198cdd7aa41a6a5f9e701bb0fbbd7844e1 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Thu, 13 Aug 2015 16:35:21 -0400 Subject: Prefer if..let over if..is_some..unwrap in codegen --- components/script/dom/bindings/codegen/CodegenRust.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index d6ca15dd546..74da05cec92 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4032,8 +4032,7 @@ class CGDOMJSProxyHandler_getOwnPropertyDescriptor(CGAbstractExternMethod): 'successCode': fillDescriptor, 'pre': 'let mut result_root = RootedValue::new(cx, UndefinedValue());' } - get += ("if index.is_some() {\n" + - " let index = index.unwrap();\n" + + get += ("if let Some(index) = index {\n" + " let this = UnwrapProxy(proxy);\n" + " let this = &*this;\n" + CGIndenter(CGProxyIndexedGetter(self.descriptor, templateValues)).define() + "\n" + @@ -4102,8 +4101,7 @@ class CGDOMJSProxyHandler_defineProperty(CGAbstractExternMethod): if not (self.descriptor.operations['IndexedCreator'] is indexedSetter): raise TypeError("Can't handle creator that's different from the setter") set += ("let index = get_array_index_from_id(cx, id);\n" + - "if index.is_some() {\n" + - " let index = index.unwrap();\n" + + "if let Some(index) = index {\n" + " let this = UnwrapProxy(proxy);\n" + " let this = &*this;\n" + CGIndenter(CGProxyIndexedSetter(self.descriptor)).define() + @@ -4186,8 +4184,7 @@ class CGDOMJSProxyHandler_hasOwn(CGAbstractExternMethod): indexedGetter = self.descriptor.operations['IndexedGetter'] if indexedGetter: indexed = ("let index = get_array_index_from_id(cx, id);\n" + - "if index.is_some() {\n" + - " let index = index.unwrap();\n" + + "if let Some(index) = index {\n" + " let this = UnwrapProxy(proxy);\n" + " let this = &*this;\n" + CGIndenter(CGProxyIndexedGetter(self.descriptor)).define() + "\n" + @@ -4259,8 +4256,7 @@ if !expando.ptr.is_null() { indexedGetter = self.descriptor.operations['IndexedGetter'] if indexedGetter: getIndexedOrExpando = ("let index = get_array_index_from_id(cx, id);\n" + - "if index.is_some() {\n" + - " let index = index.unwrap();\n" + + "if let Some(index) = index {\n" + " let this = UnwrapProxy(proxy);\n" + " let this = &*this;\n" + CGIndenter(CGProxyIndexedGetter(self.descriptor, templateValues)).define()) -- cgit v1.2.3