Merge pull request #3188 from allanrenucci/typed-return

smarter · web-flow · commit ca4b2351132e · 2017-09-27T15:38:53.000+02:00
Remove unnecessary check in `typedReturn`
diff --git a/compiler/src/dotty/tools/dotc/typer/Typer.scala b/compiler/src/dotty/tools/dotc/typer/Typer.scala
@@ -979,7 +979,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
       }
     def enclMethInfo(cx: Context): (Tree, Type) = {
       val owner = cx.owner
-      if (cx == NoContext || owner.isType) {
+      if (owner.isType) {
         ctx.error("return outside method definition", tree.pos)
         (EmptyTree, WildcardType)
       }

Original file line number	Diff line number	Diff line change
`@@ -979,7 +979,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit`
`979`	`979`	`}`
`980`	`980`	`def enclMethInfo(cx: Context): (Tree, Type) = {`
`981`	`981`	`val owner = cx.owner`
`982`		`- if (cx == NoContext \|\| owner.isType) {`
	`982`	`+ if (owner.isType) {`
`983`	`983`	`ctx.error("return outside method definition", tree.pos)`
`984`	`984`	`(EmptyTree, WildcardType)`
`985`	`985`	`}`