From 320a8c720435f466eb58212fd950b40b9d26949d Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 26 Nov 2024 01:43:12 -0500 Subject: [PATCH] Avoid inline for slash apparently --- main-settings/src/main/scala/sbt/Reference.scala | 2 +- main-settings/src/main/scala/sbt/ScopeAxis.scala | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/main-settings/src/main/scala/sbt/Reference.scala b/main-settings/src/main/scala/sbt/Reference.scala index bff8edec7..3585af816 100644 --- a/main-settings/src/main/scala/sbt/Reference.scala +++ b/main-settings/src/main/scala/sbt/Reference.scala @@ -33,7 +33,7 @@ sealed trait Reference: def /(configAxis: ScopeAxis[ConfigKey]): RefThenConfig = RefThenConfig(asScope.copy(config = configAxis)) - final def /[K](key: Scoped.ScopingSetting[K]): K = key.rescope(asScope) + final def /[K](key: Scoped.ScopingSetting[K]): K = asScope.scope(key) final def /(key: AttributeKey[?]): Scope = asScope.rescope(key) end Reference diff --git a/main-settings/src/main/scala/sbt/ScopeAxis.scala b/main-settings/src/main/scala/sbt/ScopeAxis.scala index a0feee375..6a86af166 100644 --- a/main-settings/src/main/scala/sbt/ScopeAxis.scala +++ b/main-settings/src/main/scala/sbt/ScopeAxis.scala @@ -76,11 +76,11 @@ object ScopeAxis: /** Temporary data structure to capture first two axis using slash syntax. */ class RefThenConfig(val scope: Scope): override def toString(): String = scope.toString() - inline def /[K](key: Scoped.ScopingSetting[K]): K = scope / key + def /[K](key: Scoped.ScopingSetting[K]): K = scope / key - inline def /(task: AttributeKey[?]): Scope = scope.copy(task = Select(task)) + def /(task: AttributeKey[?]): Scope = scope.copy(task = Select(task)) /** This is for handling `Zero / Zero / Zero / name`. */ - inline def /(taskAxis: ScopeAxis[AttributeKey[?]]): Scope = scope.copy(task = taskAxis) + def /(taskAxis: ScopeAxis[AttributeKey[?]]): Scope = scope.copy(task = taskAxis) end RefThenConfig end ScopeAxis