Auto merge of #10545 - amarant:unreachable-codegen, r=Ms2ger

remove unreachable code in codegen

code is unreachable after return, and identical to the upper block

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10545)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-13 03:05:33 +05:30
commit 155e4052d1

View file

@ -3800,22 +3800,6 @@ class CGUnionConversionStruct(CGThing):
pre="impl FromJSValConvertible for %s {\n" % self.type,
post="\n}")
conversions.append(CGGeneric(
"throw_not_in_union(cx, \"%s\");\n"
"Err(())" % ", ".join(names)))
method = CGWrapper(
CGIndenter(CGList(conversions, "\n\n")),
pre="unsafe fn from_jsval(cx: *mut JSContext,\n"
" value: HandleValue, _option: ()) -> Result<%s, ()> {\n" % self.type,
post="\n}")
return CGWrapper(
CGIndenter(CGList([
CGGeneric("type Config = ();"),
method,
], "\n")),
pre="impl FromJSValConvertible for %s {\n" % self.type,
post="\n}")
def try_method(self, t):
templateVars = getUnionTypeTemplateVars(t, self.descriptorProvider)
returnType = "Result<Option<%s>, ()>" % templateVars["typeName"]