Skip to content

Commit 5fe3369

Browse files
committed
Rename -Yfrom-tasty-blacklist to -Yfrom-tasty-ignore-list
1 parent fc9e4d5 commit 5fe3369

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

compiler/src/dotty/tools/dotc/Driver.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ class Driver {
8686
protected def fromTastySetup(fileNames0: List[String], ctx0: Context): (List[String], Context) =
8787
given Context = ctx0
8888
if (ctx0.settings.fromTasty.value) {
89-
val fromTastyBlacklist = ctx0.settings.YfromTastyBlacklist.value.toSet
89+
val fromTastyIgnoreList = ctx0.settings.YfromTastyIgnoreList.value.toSet
9090
// Resolve classpath and class names of tasty files
9191
val (classPaths, classNames) = fileNames0.flatMap { name =>
9292
val path = Paths.get(name)
@@ -97,7 +97,7 @@ class Driver {
9797
Nil
9898
else if name.endsWith(".jar") then
9999
new dotty.tools.io.Jar(File(name)).toList.collect {
100-
case e if e.getName.endsWith(".tasty") && !fromTastyBlacklist(e.getName) =>
100+
case e if e.getName.endsWith(".tasty") && !fromTastyIgnoreList(e.getName) =>
101101
(name, e.getName.stripSuffix(".tasty").replace("/", "."))
102102
}
103103
else

compiler/src/dotty/tools/dotc/config/ScalaSettings.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class ScalaSettings extends Settings.SettingGroup {
158158
val YretainTrees: Setting[Boolean] = BooleanSetting("-Yretain-trees", "Retain trees for top-level classes, accessible from ClassSymbol#tree")
159159
val Ysemanticdb: Setting[Boolean] = BooleanSetting("-Ysemanticdb", "Store information in SemanticDB.")
160160
val YshowTreeIds: Setting[Boolean] = BooleanSetting("-Yshow-tree-ids", "Uniquely tag all tree nodes in debugging output.")
161-
val YfromTastyBlacklist: Setting[List[String]] = MultiStringSetting("-Yfrom-tasty-blacklist", "file", "List of `tasty` files in jar files that will not be loaded when using -from-tasty")
161+
val YfromTastyIgnoreList: Setting[List[String]] = MultiStringSetting("-Yfrom-tasty-ignore-list", "file", "List of `tasty` files in jar files that will not be loaded when using -from-tasty")
162162

163163
val YprofileEnabled: Setting[Boolean] = BooleanSetting("-Yprofile-enabled", "Enable profiling.")
164164
val YprofileDestination: Setting[String] = StringSetting("-Yprofile-destination", "file", "Where to send profiling output - specify a file, default is to the console.", "")

stdlib-bootstrapped-tasty-tests/test/BootstrappedStdLibTASYyTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ object BootstrappedStdLibTASYyTest:
120120
def compileFromTastyInJar(blacklisted: Set[String]): Unit = {
121121
val driver = new dotty.tools.dotc.Driver
122122
val yFromTastyBlacklist =
123-
blacklisted.mkString("-Yfrom-tasty-blacklist:", ",", "")
123+
blacklisted.mkString("-Yfrom-tasty-ignore-list:", ",", "")
124124
val args = Array(
125125
"-classpath", ClasspathFromClassloader(getClass.getClassLoader),
126126
"-from-tasty",

0 commit comments

Comments
 (0)