diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2018-05-04 12:38:30 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-04 12:38:30 +1000 |
| commit | d8444ab9e769f0886a8aa2fc9135240f65fa4d43 (patch) | |
| tree | 3b5c8cc1223bf762613af333d6a1ff7b380a8ff5 /src/main/scala/scala/async | |
| parent | e3250b48620b8e4a3651d097ecc4c437586a2d82 (diff) | |
| parent | f8a5b0048bd08a3bdcdffd1395954e0e92ee753b (diff) | |
| download | scala-async-d8444ab9e769f0886a8aa2fc9135240f65fa4d43.tar.gz scala-async-d8444ab9e769f0886a8aa2fc9135240f65fa4d43.tar.bz2 scala-async-d8444ab9e769f0886a8aa2fc9135240f65fa4d43.zip | |
Merge pull request #195 from SethTisue/drop-scala-2.11-support
drop support for Scala 2.11 as of 0.10.0
Diffstat (limited to 'src/main/scala/scala/async')
| -rw-r--r-- | src/main/scala/scala/async/internal/TransformUtils.scala | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/src/main/scala/scala/async/internal/TransformUtils.scala b/src/main/scala/scala/async/internal/TransformUtils.scala index 016ffc1..be56bb7 100644 --- a/src/main/scala/scala/async/internal/TransformUtils.scala +++ b/src/main/scala/scala/async/internal/TransformUtils.scala @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 Lightbend Inc. <http://www.lightbend.com> + * Copyright (C) 2012-2018 Lightbend Inc. <http://www.lightbend.com> */ package scala.async.internal @@ -406,15 +406,12 @@ private[async] trait TransformUtils { } // ===================================== - // Copy/Pasted from Scala 2.10.3. See SI-7694. - private lazy val UncheckedBoundsClass = { - try c.mirror.staticClass("scala.reflect.internal.annotations.uncheckedBounds") - catch { case _: ScalaReflectionException => NoSymbol } - } - final def uncheckedBounds(tp: Type): Type = { - if ((tp.typeArgs.isEmpty && (tp match { case _: TypeRef => true; case _ => false}))|| UncheckedBoundsClass == NoSymbol) tp + // Copy/Pasted from Scala 2.10.3. See scala/bug#7694 + private lazy val UncheckedBoundsClass = + c.mirror.staticClass("scala.reflect.internal.annotations.uncheckedBounds") + final def uncheckedBounds(tp: Type): Type = + if ((tp.typeArgs.isEmpty && (tp match { case _: TypeRef => true; case _ => false}))) tp else withAnnotation(tp, Annotation(UncheckedBoundsClass.asType.toType, Nil, ListMap())) - } // ===================================== /** @@ -608,4 +605,4 @@ private[async] trait TransformUtils { } case object ContainsAwait -case object NoAwait
\ No newline at end of file +case object NoAwait |