Skip to content

Commit f08f00c

Browse files
committed
Remove @infix annotation
1 parent b6ff321 commit f08f00c

File tree

10 files changed

+2
-18
lines changed

10 files changed

+2
-18
lines changed

compiler/src/dotty/tools/dotc/core/Definitions.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -940,7 +940,6 @@ class Definitions {
940940
@tu lazy val SetterMetaAnnot: ClassSymbol = requiredClass("scala.annotation.meta.setter")
941941
@tu lazy val ShowAsInfixAnnot: ClassSymbol = requiredClass("scala.annotation.showAsInfix")
942942
@tu lazy val FunctionalInterfaceAnnot: ClassSymbol = requiredClass("java.lang.FunctionalInterface")
943-
@tu lazy val InfixAnnot: ClassSymbol = requiredClass("scala.annotation.infix")
944943
@tu lazy val TargetNameAnnot: ClassSymbol = requiredClass("scala.annotation.targetName")
945944
@tu lazy val VarargsAnnot: ClassSymbol = requiredClass("scala.annotation.varargs")
946945

compiler/src/dotty/tools/dotc/transform/SymUtils.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,6 @@ object SymUtils:
242242
/** Is symbol assumed or declared as an infix symbol? */
243243
def isDeclaredInfix(using Context): Boolean =
244244
self.is(Infix)
245-
|| self.hasAnnotation(defn.InfixAnnot)
246245
|| defn.isInfix(self)
247246
|| self.name.isUnapplyName
248247
&& self.owner.is(Module)

library/src/scala/annotation/infix.scala

Lines changed: 0 additions & 7 deletions
This file was deleted.

library/src/scala/compiletime/ops/package.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package scala.compiletime
22

3-
import scala.annotation.infix
4-
53
package object ops {
64
object any {
75
/** Equality comparison of two singleton types.

tests/neg-custom-args/infix.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// Compile with -strict -Xfatal-warnings -deprecation
2-
import scala.annotation.infix
32
class C:
43
infix def op(x: Int): Int = ???
54
def meth(x: Int): Int = ???

tests/pos/i8256.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ val a = 1
77

88
val fetch = implicitly[Test[1]]
99

10-
@main def main() : Unit = {}
10+
@main def tester() : Unit = {}

tests/pos/reference/extension-methods.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import annotation.infix
2-
31
object ExtMethods:
42

53
case class Circle(x: Double, y: Double, radius: Double)

tests/pos/singleton-ops-dispatch.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import scala.compiletime.ops._
2-
import scala.annotation.infix
32

43
object Test {
54
infix type +[X <: Int | String, Y <: Int | String] = (X, Y) match {

tests/pos/singleton-ops-test-issue-8287.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import scala.compiletime.ops.int._
2-
import scala.annotation.infix
32

43
object Test {
54
class Vec[S <: Int] {

tests/run/infix.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import annotation.{infix, targetName}
1+
import annotation.targetName
22
object Test extends App {
33

44
case class Rational(n: Int, d: Int) {

0 commit comments

Comments
 (0)