Skip to content

Commit

Permalink
Merge pull request #10707 from SethTisue/behold-the-repo-moveth
Browse files Browse the repository at this point in the history
update readme (&etc) for Scala 3 repo move
  • Loading branch information
lrytz committed Mar 7, 2024
2 parents 34d3c51 + 5a63627 commit 4b124f2
Show file tree
Hide file tree
Showing 15 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion README.md
Expand Up @@ -3,7 +3,7 @@
This is the home of the [Scala 2](https://www.scala-lang.org)
standard library, compiler, and language spec.

If you want to visit the Scala 3 repository, go to the [lampepfl/dotty](https://github.com/lampepfl/dotty).
For Scala 3, visit [scala/scala3](https://github.com/scala/scala3).

# How to contribute

Expand Down
Expand Up @@ -55,7 +55,7 @@ trait AnnotationOps { self: TastyUniverse =>
}
tree match {
case u.New(tpt) =>
// this is to handle incorrectly formatted annotations in dotty - https://github.com/lampepfl/dotty/issues/10113
// this is to handle incorrectly formatted annotations in dotty - https://github.com/scala/scala3/issues/10113
u.AnnotationInfo(tpt.tpe, Nil, Nil)
case _ =>
go(Nil, Nil, tree)
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/tools/nsc/tasty/bridge/ContextOps.scala
Expand Up @@ -194,7 +194,7 @@ trait ContextOps { self: TastyUniverse =>
protected implicit final def implyThisCtx: thisCtx.type = thisCtx

/** JAVAattr is necessary to support pipelining in Zinc, we have to set Java erasure semantics if found.
* To support this we also need to support TASTy-only classpaths, see https://github.com/lampepfl/dotty/pull/17594
* To support this we also need to support TASTy-only classpaths, see https://github.com/scala/scala3/pull/17594
* For a test case, see test/tasty/run-pipelined
*/
def isJava: Boolean = mode.is(ReadJava)
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/tools/nsc/tasty/bridge/SymbolOps.scala
Expand Up @@ -168,7 +168,7 @@ trait SymbolOps { self: TastyUniverse =>
}
if (isSymbol(member) && hasType(member)) member
else if (ctx.isJava && space.termSymbol.isModule && !space.termSymbol.hasPackageFlag) {
// TODO [tasty]: remove this workaround for https://github.com/lampepfl/dotty/issues/19619
// TODO [tasty]: remove this workaround for https://github.com/scala/scala3/issues/19619
// Use heuristic that we are accidentally looking in the static scope for some class/object,
// when really we should be looking in the instance scope. In this case, we should be always looking for
// the class and not the object, so we convert to type name and look in the companion.
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/tools/nsc/tasty/bridge/TypeOps.scala
Expand Up @@ -538,7 +538,7 @@ trait TypeOps { self: TastyUniverse =>
}

/** A synthetic type `scala.&` which accepts two type arguments, representing an intersection type
* @see https://github.com/lampepfl/dotty/issues/7688
* @see https://github.com/scala/scala3/issues/7688
*/
case object AndTpe extends Type

Expand Down
4 changes: 2 additions & 2 deletions src/compiler/scala/tools/nsc/typechecker/Infer.scala
Expand Up @@ -906,9 +906,9 @@ trait Infer extends Checkable {
case _ if !currentRun.isScala3ImplicitResolution => existentialAbstraction(undef1, tpe1) <:< existentialAbstraction(undef2, tpe2)
case _ =>
// Backport of fix for https://github.com/scala/bug/issues/2509
// from Dotty https://github.com/lampepfl/dotty/commit/89540268e6c49fb92b9ca61249e46bb59981bf5a
// from Dotty https://github.com/scala/scala3/commit/89540268e6c49fb92b9ca61249e46bb59981bf5a
//
// Note that as of https://github.com/lampepfl/dotty/commit/b9f3084205bc9fcbd2a5181d3f0e539e2a20253a
// Note that as of https://github.com/scala/scala3/commit/b9f3084205bc9fcbd2a5181d3f0e539e2a20253a
// Dotty flips variances throughout, not just at the top level. We follow that behaviour here.

val e1 = existentialAbstraction(undef1, tpe1)
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/tools/tasty/TastyFormat.scala
Expand Up @@ -12,7 +12,7 @@

package scala.tools.tasty

// revision: https://github.com/lampepfl/dotty/commit/0938fe5603a17c7c786ac8fc6118a9d5d8b257de
// revision: https://github.com/scala/scala3/commit/0938fe5603a17c7c786ac8fc6118a9d5d8b257de
object TastyFormat {

/** The first four bytes of a TASTy file, followed by four values:
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/scala/tools/tasty/TastyVersion.scala
Expand Up @@ -12,7 +12,7 @@

package scala.tools.tasty

// sourced from: https://github.com/lampepfl/dotty/blob/release-3.4.0/tasty/src/dotty/tools/tasty/TastyVersion.scala
// sourced from: https://github.com/scala/scala3/blob/release-3.4.0/tasty/src/dotty/tools/tasty/TastyVersion.scala

case class TastyVersion private(major: Int, minor: Int, experimental: Int) {
def isExperimental: Boolean = experimental > 0
Expand Down
2 changes: 1 addition & 1 deletion test/files/pos/t2509-5.scala
@@ -1,4 +1,4 @@
// See https://github.com/lampepfl/dotty/issues/2974
// See https://github.com/scala/scala3/issues/2974
// scalac: -Yscala3-implicit-resolution

trait Foo[-T]
Expand Down
4 changes: 2 additions & 2 deletions test/junit/scala/tools/nsc/typechecker/InferencerTest.scala
Expand Up @@ -60,7 +60,7 @@ class InferencerTests extends BytecodeTesting {
val ZBwC = typeOf[ZwC[B]]

// https://github.com/scala/bug/issues/2509
// See discussion at https://github.com/lampepfl/dotty/blob/89540268e6c49fb92b9ca61249e46bb59981bf5a/src/dotty/tools/dotc/typer/Applications.scala#L925-L951
// See discussion at https://github.com/scala/scala3/blob/89540268e6c49fb92b9ca61249e46bb59981bf5a/src/dotty/tools/dotc/typer/Applications.scala#L925-L951

// Covariant
assertTrue(!typer.infer.isAsSpecific(XA, XB))
Expand Down Expand Up @@ -127,7 +127,7 @@ class InferencerTests extends BytecodeTesting {
val ZBwC = typeOf[ZwC[B]]

// https://github.com/scala/bug/issues/2509
// See discussion at https://github.com/lampepfl/dotty/blob/89540268e6c49fb92b9ca61249e46bb59981bf5a/src/dotty/tools/dotc/typer/Applications.scala#L925-L951
// See discussion at https://github.com/scala/scala3/blob/89540268e6c49fb92b9ca61249e46bb59981bf5a/src/dotty/tools/dotc/typer/Applications.scala#L925-L951

// Covariant
assertTrue(!typer.infer.isAsSpecific(XA, XB))
Expand Down
Expand Up @@ -51,7 +51,7 @@ object TestInnerClass extends scala.App {
* 71: IDENTtpt 13 [U]
* 73: SHAREDtype 62 ()
* So either we do branching to lookup `Inner` in the non-static scope, or we do nothing
* and fix the TASTy generation (AKA fix the scala 3 typer, see https://github.com/lampepfl/dotty/issues/19619)
* and fix the TASTy generation (AKA fix the scala 3 typer, see https://github.com/scala/scala3/issues/19619)
*/
val ici_inner3: InnerClass#Inner[Long] = InnerClass.createInnerStatic[Long](47L)

Expand Down
2 changes: 1 addition & 1 deletion test/tasty/run/src-2/tastytest/TestHKNest.scala
Expand Up @@ -25,6 +25,6 @@ object TestHKNest extends Suite("TestHKNest") {

type OrNothing[I] = Either[Nothing, I]

// test(assert(new HKClass_8[Boo].foo(new Boo[StringOrInt]) == "Boo")) blocked by https://github.com/lampepfl/dotty/issues/8329
// test(assert(new HKClass_8[Boo].foo(new Boo[StringOrInt]) == "Boo")) blocked by https://github.com/scala/scala3/issues/8329

}
2 changes: 1 addition & 1 deletion test/tasty/run/src-2/tastytest/TestHello.scala
Expand Up @@ -25,7 +25,7 @@ object TestHello extends Suite("TestHello") {
test(assert((HelloWorld.lzy: "lazy") === "lazy"))
test(assert(HelloWorld.acceptsOnlyMsg4(HelloWorld.msg4) === "Hello, World!Hello, World!"))
test(assert(HelloWorld.`1) my long test assertion that 1^3 == 2` === 2))
// test(assert(HelloWorld.`<init>` === 157)) // wait until https://github.com/lampepfl/dotty/issues/7799
// test(assert(HelloWorld.`<init>` === 157)) // wait until https://github.com/scala/scala3/issues/7799

type OrInt[A] = Either[Int, A]

Expand Down
6 changes: 3 additions & 3 deletions test/tasty/run/src-3/tastytest/HKNest.scala
Expand Up @@ -59,11 +59,11 @@ object HKNest {
type ThrowawayHK[G[X]] = Foo[[T] =>> Either[Nothing, T]]

// class HKClass_8[P[F[X <: String]] <: Hoo[StringOrInt]] {
// def foo[F[X <: String]](x: P[F]): String = x.toString() https://github.com/lampepfl/dotty/issues/8329
// def foo[F[X <: String]](x: P[F]): String = x.toString() https://github.com/scala/scala3/issues/8329
// }

type OrInt[X] = Either[X, Int]
// type StringOrInt[X <: String] = Either[X, Int] https://github.com/lampepfl/dotty/issues/8329
// type StringOrInt[X <: String] = Either[X, Int] https://github.com/scala/scala3/issues/8329

class Box[A]

Expand Down Expand Up @@ -109,7 +109,7 @@ object HKNest {
override def toString(): String = "Contra"
}

// class Hoo[F[X <: String] <: Either[X, Int]] { https://github.com/lampepfl/dotty/issues/8329
// class Hoo[F[X <: String] <: Either[X, Int]] { https://github.com/scala/scala3/issues/8329
// override def toString(): String = "Hoo"
// }

Expand Down
2 changes: 1 addition & 1 deletion test/tasty/run/src-3/tastytest/HelloWorld.scala
Expand Up @@ -27,6 +27,6 @@ object HelloWorld {
def acceptsOnlyMsg4(m: msg4.type): String = m + m
final lazy val lzy = "lazy"
def `1) my long test assertion that 1^3 == 2`: Int = 1^3
// def `<init>`: Int = 157 // broken in https://github.com/lampepfl/dotty/issues/7799
// def `<init>`: Int = 157 // broken in https://github.com/scala/scala3/issues/7799

}

0 comments on commit 4b124f2

Please sign in to comment.