From bd59f647278185a0c6c0894695c767731d212578 Mon Sep 17 00:00:00 2001 From: jvican Date: Thu, 25 May 2017 19:05:27 +0200 Subject: [PATCH] Rename `sbt.unchecked` to `sbt.sbtUnchecked` As per Eugene's suggestion. --- main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala | 2 +- main-settings/src/main/scala/sbt/unchecked.scala | 2 +- main-settings/src/test/scala/sbt/std/TaskPosSpec.scala | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala b/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala index 7cd64f42a..6798d8144 100644 --- a/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala +++ b/main-settings/src/main/scala/sbt/std/TaskLinterDSL.scala @@ -16,7 +16,7 @@ abstract class BaseTaskLinterDSL extends LinterDSL { import ctx.universe._ val isTask = convert.asPredicate(ctx) class traverser extends Traverser { - private val unchecked = symbolOf[sbt.unchecked].asClass + private val unchecked = symbolOf[sbt.sbtUnchecked].asClass private val uncheckedWrappers = MutableSet.empty[Tree] var insideIf: Boolean = false var insideAnon: Boolean = false diff --git a/main-settings/src/main/scala/sbt/unchecked.scala b/main-settings/src/main/scala/sbt/unchecked.scala index 7599e9bb8..072150f8b 100644 --- a/main-settings/src/main/scala/sbt/unchecked.scala +++ b/main-settings/src/main/scala/sbt/unchecked.scala @@ -10,4 +10,4 @@ import scala.annotation.Annotation * * @since 1.0.0 */ -class unchecked extends Annotation +class sbtUnchecked extends Annotation diff --git a/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala b/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala index 1d5406f0c..3cd8eed74 100644 --- a/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala +++ b/main-settings/src/test/scala/sbt/std/TaskPosSpec.scala @@ -34,8 +34,8 @@ class TaskPosSpec { val bar = taskKey[String]("") var condition = true val baz = Def.task[String] { - if (condition) foo.value: @unchecked - else bar.value: @unchecked + if (condition) foo.value: @sbtUnchecked + else bar.value: @sbtUnchecked } }