Skip to content

Commit 12a10f2

Browse files
mbovelmbovel
committed
Revert #14452 
1 parent 0181ef9 commit 12a10f2

File tree

8 files changed

+93
-101
lines changed

8 files changed

+93
-101
lines changed

‎library/src/scala/compiletime/ops/any.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object any:
1010
* ```
1111
* @syntax markdown
1212
*/
13-
type ==[+X, +Y] <: Boolean
13+
type ==[X, Y] <: Boolean
1414

1515
/** Inequality comparison of two singleton types.
1616
* ```scala
@@ -20,7 +20,7 @@ object any:
2020
* ```
2121
* @syntax markdown
2222
*/
23-
type !=[+X, +Y] <: Boolean
23+
type !=[X, Y] <: Boolean
2424

2525
/** Tests if a type is a constant.
2626
* ```scala
@@ -48,4 +48,4 @@ object any:
4848
* ```
4949
* @syntax markdown
5050
*/
51-
type ToString[+X] <: String
51+
type ToString[X] <: String

‎library/src/scala/compiletime/ops/boolean.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ object boolean:
1010
* ```
1111
* @syntax markdown
1212
*/
13-
type ![+X <: Boolean] <: Boolean
13+
type ![X <: Boolean] <: Boolean
1414

1515
/** Exclusive disjunction of two `Boolean` singleton types.
1616
* ```scala
@@ -19,7 +19,7 @@ object boolean:
1919
* ```
2020
* @syntax markdown
2121
*/
22-
type ^[+X <: Boolean, +Y <: Boolean] <: Boolean
22+
type ^[X <: Boolean, Y <: Boolean] <: Boolean
2323

2424
/** Conjunction of two `Boolean` singleton types.
2525
* ```scala
@@ -28,7 +28,7 @@ object boolean:
2828
* ```
2929
* @syntax markdown
3030
*/
31-
type &&[+X <: Boolean, +Y <: Boolean] <: Boolean
31+
type &&[X <: Boolean, Y <: Boolean] <: Boolean
3232

3333
/** Disjunction of two `Boolean` singleton types.
3434
* ```scala
@@ -37,4 +37,4 @@ object boolean:
3737
* ```
3838
* @syntax markdown
3939
*/
40-
type ||[+X <: Boolean, +Y <: Boolean] <: Boolean
40+
type ||[X <: Boolean, Y <: Boolean] <: Boolean

‎library/src/scala/compiletime/ops/double.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ object double:
88
* ```
99
* @syntax markdown
1010
*/
11-
type +[+X <: Double, +Y <: Double] <: Double
11+
type +[X <: Double, Y <: Double] <: Double
1212

1313
/** Subtraction of two `Double` singleton types.
1414
* ```scala
1515
* val sub: 4.0 - 2.0 = 2.0
1616
* ```
1717
* @syntax markdown
1818
*/
19-
type -[+X <: Double, +Y <: Double] <: Double
19+
type -[X <: Double, Y <: Double] <: Double
2020

2121
/** Multiplication of two `Double` singleton types.
2222
* ```scala
2323
* val mul: 4.0 * 2.0 = 8.0
2424
* ```
2525
* @syntax markdown
2626
*/
27-
type *[+X <: Double, +Y <: Double] <: Double
27+
type *[X <: Double, Y <: Double] <: Double
2828

2929
/** Integer division of two `Double` singleton types.
3030
* ```scala
3131
* val div: 5.0 / 2.0 = 2.5
3232
* ```
3333
* @syntax markdown
3434
*/
35-
type /[+X <: Double, +Y <: Double] <: Double
35+
type /[X <: Double, Y <: Double] <: Double
3636

3737
/** Remainder of the division of `X` by `Y`.
3838
* ```scala
3939
* val mod: 5.0 % 2.0 = 1.0
4040
* ```
4141
* @syntax markdown
4242
*/
43-
type %[+X <: Double, +Y <: Double] <: Double
43+
type %[X <: Double, Y <: Double] <: Double
4444

4545
/** Less-than comparison of two `Double` singleton types.
4646
* ```scala
@@ -49,7 +49,7 @@ object double:
4949
* ```
5050
* @syntax markdown
5151
*/
52-
type <[+X <: Double, +Y <: Double] <: Boolean
52+
type <[X <: Double, Y <: Double] <: Boolean
5353

5454
/** Greater-than comparison of two `Double` singleton types.
5555
* ```scala
@@ -58,7 +58,7 @@ object double:
5858
* ```
5959
* @syntax markdown
6060
*/
61-
type >[+X <: Double, +Y <: Double] <: Boolean
61+
type >[X <: Double, Y <: Double] <: Boolean
6262

6363
/** Greater-or-equal comparison of two `Double` singleton types.
6464
* ```scala
@@ -67,7 +67,7 @@ object double:
6767
* ```
6868
* @syntax markdown
6969
*/
70-
type >=[+X <: Double, +Y <: Double] <: Boolean
70+
type >=[X <: Double, Y <: Double] <: Boolean
7171

7272
/** Less-or-equal comparison of two `Double` singleton types.
7373
* ```scala
@@ -76,15 +76,15 @@ object double:
7676
* ```
7777
* @syntax markdown
7878
*/
79-
type <=[+X <: Double, +Y <: Double] <: Boolean
79+
type <=[X <: Double, Y <: Double] <: Boolean
8080

8181
/** Absolute value of an `Double` singleton type.
8282
* ```scala
8383
* val abs: Abs[-1.0] = 1.0
8484
* ```
8585
* @syntax markdown
8686
*/
87-
type Abs[+X <: Double] <: Double
87+
type Abs[X <: Double] <: Double
8888

8989
/** Negation of an `Double` singleton type.
9090
* ```scala
@@ -93,44 +93,44 @@ object double:
9393
* ```
9494
* @syntax markdown
9595
*/
96-
type Negate[+X <: Double] <: Double
96+
type Negate[X <: Double] <: Double
9797

9898
/** Minimum of two `Double` singleton types.
9999
* ```scala
100100
* val min: Min[-1.0, 1.0] = -1.0
101101
* ```
102102
* @syntax markdown
103103
*/
104-
type Min[+X <: Double, +Y <: Double] <: Double
104+
type Min[X <: Double, Y <: Double] <: Double
105105

106106
/** Maximum of two `Double` singleton types.
107107
* ```scala
108108
* val max: Max[-1.0, 1.0] = 1.0
109109
* ```
110110
* @syntax markdown
111111
*/
112-
type Max[+X <: Double, +Y <: Double] <: Double
112+
type Max[X <: Double, Y <: Double] <: Double
113113

114114
/** Int conversion of a `Double` singleton type.
115115
* ```scala
116116
* val x: ToInt[1.0] = 1
117117
* ```
118118
* @syntax markdown
119119
*/
120-
type ToInt[+X <: Double] <: Int
120+
type ToInt[X <: Double] <: Int
121121

122122
/** Long conversion of a `Double` singleton type.
123123
* ```scala
124124
* val x: ToLong[1.0] = 1L
125125
* ```
126126
* @syntax markdown
127127
*/
128-
type ToLong[+X <: Double] <: Long
128+
type ToLong[X <: Double] <: Long
129129

130130
/** Float conversion of a `Double` singleton type.
131131
* ```scala
132132
* val x: ToFloat[1.0] = 1.0f
133133
* ```
134134
* @syntax markdown
135135
*/
136-
type ToFloat[+X <: Double] <: Float
136+
type ToFloat[X <: Double] <: Float

‎library/src/scala/compiletime/ops/float.scala

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ object float:
88
* ```
99
* @syntax markdown
1010
*/
11-
type +[+X <: Float, +Y <: Float] <: Float
11+
type +[X <: Float, Y <: Float] <: Float
1212

1313
/** Subtraction of two `Float` singleton types.
1414
* ```scala
1515
* val sub: 4.0f - 2.0f = 2.0f
1616
* ```
1717
* @syntax markdown
1818
*/
19-
type -[+X <: Float, +Y <: Float] <: Float
19+
type -[X <: Float, Y <: Float] <: Float
2020

2121
/** Multiplication of two `Float` singleton types.
2222
* ```scala
2323
* val mul: 4.0f * 2.0f = 8.0f
2424
* ```
2525
* @syntax markdown
2626
*/
27-
type *[+X <: Float, +Y <: Float] <: Float
27+
type *[X <: Float, Y <: Float] <: Float
2828

2929
/** Integer division of two `Float` singleton types.
3030
* ```scala
3131
* val div: 5.0f / 2.0f = 2.5f
3232
* ```
3333
* @syntax markdown
3434
*/
35-
type /[+X <: Float, +Y <: Float] <: Float
35+
type /[X <: Float, Y <: Float] <: Float
3636

3737
/** Remainder of the division of `X` by `Y`.
3838
* ```scala
3939
* val mod: 5.0f % 2.0f = 1.0f
4040
* ```
4141
* @syntax markdown
4242
*/
43-
type %[+X <: Float, +Y <: Float] <: Float
43+
type %[X <: Float, Y <: Float] <: Float
4444

4545
/** Less-than comparison of two `Float` singleton types.
4646
* ```scala
@@ -49,7 +49,7 @@ object float:
4949
* ```
5050
* @syntax markdown
5151
*/
52-
type <[+X <: Float, +Y <: Float] <: Boolean
52+
type <[X <: Float, Y <: Float] <: Boolean
5353

5454
/** Greater-than comparison of two `Float` singleton types.
5555
* ```scala
@@ -58,7 +58,7 @@ object float:
5858
* ```
5959
* @syntax markdown
6060
*/
61-
type >[+X <: Float, +Y <: Float] <: Boolean
61+
type >[X <: Float, Y <: Float] <: Boolean
6262

6363
/** Greater-or-equal comparison of two `Float` singleton types.
6464
* ```scala
@@ -67,7 +67,7 @@ object float:
6767
* ```
6868
* @syntax markdown
6969
*/
70-
type >=[+X <: Float, +Y <: Float] <: Boolean
70+
type >=[X <: Float, Y <: Float] <: Boolean
7171

7272
/** Less-or-equal comparison of two `Float` singleton types.
7373
* ```scala
@@ -76,15 +76,15 @@ object float:
7676
* ```
7777
* @syntax markdown
7878
*/
79-
type <=[+X <: Float, +Y <: Float] <: Boolean
79+
type <=[X <: Float, Y <: Float] <: Boolean
8080

8181
/** Absolute value of an `Float` singleton type.
8282
* ```scala
8383
* val abs: Abs[-1.0f] = 1.0f
8484
* ```
8585
* @syntax markdown
8686
*/
87-
type Abs[+X <: Float] <: Float
87+
type Abs[X <: Float] <: Float
8888

8989
/** Negation of an `Float` singleton type.
9090
* ```scala
@@ -93,44 +93,44 @@ object float:
9393
* ```
9494
* @syntax markdown
9595
*/
96-
type Negate[+X <: Float] <: Float
96+
type Negate[X <: Float] <: Float
9797

9898
/** Minimum of two `Float` singleton types.
9999
* ```scala
100100
* val min: Min[-1.0f, 1.0f] = -1.0f
101101
* ```
102102
* @syntax markdown
103103
*/
104-
type Min[+X <: Float, +Y <: Float] <: Float
104+
type Min[X <: Float, Y <: Float] <: Float
105105

106106
/** Maximum of two `Float` singleton types.
107107
* ```scala
108108
* val max: Max[-1.0f, 1.0f] = 1.0f
109109
* ```
110110
* @syntax markdown
111111
*/
112-
type Max[+X <: Float, +Y <: Float] <: Float
112+
type Max[X <: Float, Y <: Float] <: Float
113113

114114
/** Int conversion of a `Float` singleton type.
115115
* ```scala
116116
* val x: ToInt[1.0f] = 1
117117
* ```
118118
* @syntax markdown
119119
*/
120-
type ToInt[+X <: Float] <: Int
120+
type ToInt[X <: Float] <: Int
121121

122122
/** Long conversion of a `Float` singleton type.
123123
* ```scala
124124
* val x: ToLong[1.0f] = 1L
125125
* ```
126126
* @syntax markdown
127127
*/
128-
type ToLong[+X <: Float] <: Long
128+
type ToLong[X <: Float] <: Long
129129

130130
/** Double conversion of a `Float` singleton type.
131131
* ```scala
132132
* val x: ToDouble[1.0f] = 1.0
133133
* ```
134134
* @syntax markdown
135135
*/
136-
type ToDouble[+X <: Float] <: Double
136+
type ToDouble[X <: Float] <: Double

0 commit comments

Comments
 (0)