Skip to content

Commit 15e003a

Browse files
committed
Fix rebase breakage
1 parent 4051708 commit 15e003a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler/src/dotty/tools/dotc/typer/Applications.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@ trait Applications extends Compatibility {
18381838
val tp1p = prepare(tp1)
18391839
val tp2p = prepare(tp2)
18401840

1841-
if Feature.sourceVersion.isAtMost(SourceVersion.`3.5`)
1841+
if Feature.sourceVersion.isAtMost(SourceVersion.`3.4`)
18421842
|| oldResolution
18431843
|| !alt1isGiven && !alt2isGiven
18441844
then

tests/run-tasty-inspector/stdlibExperimentalDefinitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ val experimentalDefinitionInLibrary = Set(
8484
"scala.Precise",
8585
"scala.annotation.internal.WitnessNames",
8686
"scala.compiletime.package$package$.deferred",
87-
"scala.Predef$.is",
87+
"scala.runtime.stdLibPatches.Predef$.is",
8888
)
8989

9090

0 commit comments

Comments
 (0)