Skip to content

Commit 1fff065

Browse files
committed
Update all references to new settings
1 parent 3453a41 commit 1fff065

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

compiler/test/dotty/tools/dotc/core/tasty/CommentPicklingTest.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ class CommentPicklingTest {
110110
private class UnpicklingDriver extends Driver {
111111
override def initCtx =
112112
val ctx = super.initCtx.fresh
113-
ctx.setSetting(ctx.settings.YreadComments, true)
113+
ctx.setSetting(ctx.settings.XreadComments, true)
114114
ctx
115115

116116
def unpickle[T](args: Array[String], files: List[File])(fn: (List[tpd.Tree], Context) => T): T = {

docs/_docs/reference/changed-features/wildcards.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ A step-by-step migration is made possible with the following measures:
3535
4. Some deprecation warnings are already available under the `-source future` setting.
3636

3737
To smooth the transition for codebases that use kind-projector, we adopt the following measures under the command line
38-
option `-Xkind-projector`:
38+
option `-Ykind-projector`:
3939

4040
1. In Scala 3.0, `*` is available as a type parameter placeholder.
4141
2. In Scala 3.2, `*` is deprecated in favor of `_`. A `-rewrite` option is
4242
available to rewrite one to the other.
4343
3. In Scala 3.3, `*` is removed again, and all type parameter placeholders will be expressed with `_`.
4444

45-
These rules make it possible to cross-build between Scala 2 using the kind projector plugin and Scala 3.0 - 3.2 using the compiler option `-Xkind-projector`.
45+
These rules make it possible to cross-build between Scala 2 using the kind projector plugin and Scala 3.0 - 3.2 using the compiler option `-Ykind-projector`.
4646

4747
There is also a migration path for users that want a one-time transition to syntax with `_` as a type parameter placeholder.
48-
With option `-Xkind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards.
48+
With option `-Ykind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards.
4949

5050
To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher)

docs/_spec/APPLIEDreference/changed-features/wildcards.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ A step-by-step migration is made possible with the following measures:
3535
4. The Scala 3.1 behavior is already available today under the `-source future` setting.
3636

3737
To smooth the transition for codebases that use kind-projector, we adopt the following measures under the command line
38-
option `-Xkind-projector`:
38+
option `-Ykind-projector`:
3939

4040
1. In Scala 3.0, `*` is available as a type parameter placeholder.
4141
2. In Scala 3.2, `*` is deprecated in favor of `_`. A `-rewrite` option is
4242
available to rewrite one to the other.
4343
3. In Scala 3.3, `*` is removed again, and all type parameter placeholders will be expressed with `_`.
4444

45-
These rules make it possible to cross build between Scala 2 using the kind projector plugin and Scala 3.0 - 3.2 using the compiler option `-Xkind-projector`.
45+
These rules make it possible to cross build between Scala 2 using the kind projector plugin and Scala 3.0 - 3.2 using the compiler option `-Ykind-projector`.
4646

4747
There is also a migration path for users that want a one-time transition to syntax with `_` as a type parameter placeholder.
48-
With option `-Xkind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards.
48+
With option `-Ykind-projector:underscores` Scala 3 will regard `_` as a type parameter placeholder, leaving `?` as the only syntax for wildcards.
4949

5050
To cross-compile with old Scala 2 sources, while using `_` a placeholder, you must use options `-Xsource:3 -P:kind-projector:underscore-placeholders` together with a recent version of kind-projector (`0.13` and higher) and most recent versions of Scala 2 (`2.13.5` and higher and `2.12.14` and higher)

scaladoc/src/dotty/tools/scaladoc/snippets/SnippetCompiler.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class SnippetCompiler(
3030
rootCtx.setSetting(rootCtx.settings.YnoExperimental, true)
3131
rootCtx.setSetting(rootCtx.settings.experimental, true)
3232
rootCtx.setSetting(rootCtx.settings.YretainTrees, true)
33-
rootCtx.setSetting(rootCtx.settings.YcookComments, true)
34-
rootCtx.setSetting(rootCtx.settings.YreadComments, true)
33+
rootCtx.setSetting(rootCtx.settings.XcookComments, true)
34+
rootCtx.setSetting(rootCtx.settings.XreadComments, true)
3535
rootCtx.setSetting(rootCtx.settings.color, "never")
3636
rootCtx.setSetting(rootCtx.settings.XimportSuggestionTimeout, 0)
3737

scaladoc/src/scala/tasty/inspector/TastyInspector.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ object TastyInspector:
103103
reset()
104104
val ctx2 = ctx.fresh
105105
.addMode(Mode.ReadPositions)
106-
.setSetting(ctx.settings.YreadComments, true)
106+
.setSetting(ctx.settings.XreadComments, true)
107107
new TASTYRun(this, ctx2)
108108

109109
new InspectorDriver

tasty-inspector/src/scala/tasty/inspector/TastyInspector.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ object TastyInspector:
100100
reset()
101101
val ctx2 = ctx.fresh
102102
.addMode(Mode.ReadPositions)
103-
.setSetting(ctx.settings.YreadComments, true)
103+
.setSetting(ctx.settings.XreadComments, true)
104104
new TASTYRun(this, ctx2)
105105

106106
new InspectorDriver

0 commit comments

Comments
 (0)