Merge pull request #2380 from dotty-staging/fix-@2379

felixmulder · web-flow · commit e67ff616f150 · 2017-05-06T00:13:53.000+02:00
Fix #2379: Deprecate `with` in types only under -strict
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -763,7 +763,8 @@ object Parsers {
 
     def withTypeRest(t: Tree): Tree =
       if (in.token == WITH) {
-        deprecationWarning(DeprecatedWithOperator())
+        if (ctx.settings.strict.value)
+          deprecationWarning(DeprecatedWithOperator())
         in.nextToken()
         AndTypeTree(t, withType())
       }

Original file line number	Diff line number	Diff line change
`@@ -763,7 +763,8 @@ object Parsers {`
`763`	`763`
`764`	`764`	`def withTypeRest(t: Tree): Tree =`
`765`	`765`	`if (in.token == WITH) {`
`766`		`- deprecationWarning(DeprecatedWithOperator())`
	`766`	`+ if (ctx.settings.strict.value)`
	`767`	`+ deprecationWarning(DeprecatedWithOperator())`
`767`	`768`	`in.nextToken()`
`768`	`769`	`AndTypeTree(t, withType())`
`769`	`770`	`}`