summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorAdriaan Moors <adriaan.moors@epfl.ch>2012-06-13 02:10:02 -0700
committerAdriaan Moors <adriaan.moors@epfl.ch>2012-06-13 02:10:02 -0700
commit885d64dce1c3a34b01f4ffcbd2132838d3c60443 (patch)
tree485307fe0707377eaff1d5c8ed7a970095fecb5b /src/compiler
parent3103bbd9e21e1be73e8d05cd969f06b7ab4f84b3 (diff)
parent039d826e99519bcf363e92bba7d9a5bc82e708ef (diff)
downloadscala-885d64dce1c3a34b01f4ffcbd2132838d3c60443.tar.gz
scala-885d64dce1c3a34b01f4ffcbd2132838d3c60443.tar.bz2
scala-885d64dce1c3a34b01f4ffcbd2132838d3c60443.zip
Merge pull request #705 from paulp/topic/unchecked
Suppress non-local return unchecked warnings.
Diffstat (limited to 'src/compiler')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Infer.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Infer.scala b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
index 9e371dd2dd..688dcd91ac 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Infer.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Infer.scala
@@ -1276,7 +1276,8 @@ trait Infer {
} else {
for (arg <- args) {
if (sym == ArrayClass) check(arg, bound)
- else if (arg.typeArgs.nonEmpty) () // avoid spurious warnings with higher-kinded types
+ else if (arg.typeArgs.nonEmpty) () // avoid spurious warnings with higher-kinded types
+ else if (sym == NonLocalReturnControlClass) () // no way to suppress unchecked warnings on try/catch
else arg match {
case TypeRef(_, sym, _) if isLocalBinding(sym) =>
;