Skip to content

Commit 76b73c5

Browse files
mbovelbishabosha
mbovel
authored and
bishabosha
committed
Revert scala#14452 
1 parent 5d39316 commit 76b73c5

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
@@ -13,7 +13,7 @@ object any:
1313
* ```
1414
* @syntax markdown
1515
*/
16-
type ==[+X, +Y] <: Boolean
16+
type ==[X, Y] <: Boolean
1717

1818
/** Inequality comparison of two singleton types.
1919
* ```scala
@@ -26,7 +26,7 @@ object any:
2626
* ```
2727
* @syntax markdown
2828
*/
29-
type !=[+X, +Y] <: Boolean
29+
type !=[X, Y] <: Boolean
3030

3131
/** Tests if a type is a constant.
3232
* ```scala
@@ -63,4 +63,4 @@ object any:
6363
* ```
6464
* @syntax markdown
6565
*/
66-
type ToString[+X] <: String
66+
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
@@ -13,7 +13,7 @@ object boolean:
1313
* ```
1414
* @syntax markdown
1515
*/
16-
type ![+X <: Boolean] <: Boolean
16+
type ![X <: Boolean] <: Boolean
1717

1818
/** Exclusive disjunction of two `Boolean` singleton types.
1919
* ```scala
@@ -25,7 +25,7 @@ object boolean:
2525
* ```
2626
* @syntax markdown
2727
*/
28-
type ^[+X <: Boolean, +Y <: Boolean] <: Boolean
28+
type ^[X <: Boolean, Y <: Boolean] <: Boolean
2929

3030
/** Conjunction of two `Boolean` singleton types.
3131
* ```scala
@@ -37,7 +37,7 @@ object boolean:
3737
* ```
3838
* @syntax markdown
3939
*/
40-
type &&[+X <: Boolean, +Y <: Boolean] <: Boolean
40+
type &&[X <: Boolean, Y <: Boolean] <: Boolean
4141

4242
/** Disjunction of two `Boolean` singleton types.
4343
* ```scala
@@ -49,4 +49,4 @@ object boolean:
4949
* ```
5050
* @syntax markdown
5151
*/
52-
type ||[+X <: Boolean, +Y <: Boolean] <: Boolean
52+
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
@@ -11,7 +11,7 @@ object double:
1111
* ```
1212
* @syntax markdown
1313
*/
14-
type +[+X <: Double, +Y <: Double] <: Double
14+
type +[X <: Double, Y <: Double] <: Double
1515

1616
/** Subtraction of two `Double` singleton types.
1717
* ```scala
@@ -22,7 +22,7 @@ object double:
2222
* ```
2323
* @syntax markdown
2424
*/
25-
type -[+X <: Double, +Y <: Double] <: Double
25+
type -[X <: Double, Y <: Double] <: Double
2626

2727
/** Multiplication of two `Double` singleton types.
2828
* ```scala
@@ -33,7 +33,7 @@ object double:
3333
* ```
3434
* @syntax markdown
3535
*/
36-
type *[+X <: Double, +Y <: Double] <: Double
36+
type *[X <: Double, Y <: Double] <: Double
3737

3838
/** Integer division of two `Double` singleton types.
3939
* ```scala
@@ -44,7 +44,7 @@ object double:
4444
* ```
4545
* @syntax markdown
4646
*/
47-
type /[+X <: Double, +Y <: Double] <: Double
47+
type /[X <: Double, Y <: Double] <: Double
4848

4949
/** Remainder of the division of `X` by `Y`.
5050
* ```scala
@@ -55,7 +55,7 @@ object double:
5555
* ```
5656
* @syntax markdown
5757
*/
58-
type %[+X <: Double, +Y <: Double] <: Double
58+
type %[X <: Double, Y <: Double] <: Double
5959

6060
/** Less-than comparison of two `Double` singleton types.
6161
* ```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
/** Greater-than comparison of two `Double` singleton types.
7373
* ```scala
@@ -79,7 +79,7 @@ object double:
7979
* ```
8080
* @syntax markdown
8181
*/
82-
type >[+X <: Double, +Y <: Double] <: Boolean
82+
type >[X <: Double, Y <: Double] <: Boolean
8383

8484
/** Greater-or-equal comparison of two `Double` singleton types.
8585
* ```scala
@@ -91,7 +91,7 @@ object double:
9191
* ```
9292
* @syntax markdown
9393
*/
94-
type >=[+X <: Double, +Y <: Double] <: Boolean
94+
type >=[X <: Double, Y <: Double] <: Boolean
9595

9696
/** Less-or-equal comparison of two `Double` singleton types.
9797
* ```scala
@@ -103,7 +103,7 @@ object double:
103103
* ```
104104
* @syntax markdown
105105
*/
106-
type <=[+X <: Double, +Y <: Double] <: Boolean
106+
type <=[X <: Double, Y <: Double] <: Boolean
107107

108108
/** Absolute value of an `Double` singleton type.
109109
* ```scala
@@ -114,7 +114,7 @@ object double:
114114
* ```
115115
* @syntax markdown
116116
*/
117-
type Abs[+X <: Double] <: Double
117+
type Abs[X <: Double] <: Double
118118

119119
/** Negation of an `Double` singleton type.
120120
* ```scala
@@ -126,7 +126,7 @@ object double:
126126
* ```
127127
* @syntax markdown
128128
*/
129-
type Negate[+X <: Double] <: Double
129+
type Negate[X <: Double] <: Double
130130

131131
/** Minimum of two `Double` singleton types.
132132
* ```scala
@@ -137,7 +137,7 @@ object double:
137137
* ```
138138
* @syntax markdown
139139
*/
140-
type Min[+X <: Double, +Y <: Double] <: Double
140+
type Min[X <: Double, Y <: Double] <: Double
141141

142142
/** Maximum of two `Double` singleton types.
143143
* ```scala
@@ -148,7 +148,7 @@ object double:
148148
* ```
149149
* @syntax markdown
150150
*/
151-
type Max[+X <: Double, +Y <: Double] <: Double
151+
type Max[X <: Double, Y <: Double] <: Double
152152

153153
/** Int conversion of a `Double` singleton type.
154154
* ```scala
@@ -159,7 +159,7 @@ object double:
159159
* ```
160160
* @syntax markdown
161161
*/
162-
type ToInt[+X <: Double] <: Int
162+
type ToInt[X <: Double] <: Int
163163

164164
/** Long conversion of a `Double` singleton type.
165165
* ```scala
@@ -170,7 +170,7 @@ object double:
170170
* ```
171171
* @syntax markdown
172172
*/
173-
type ToLong[+X <: Double] <: Long
173+
type ToLong[X <: Double] <: Long
174174

175175
/** Float conversion of a `Double` singleton type.
176176
* ```scala
@@ -181,4 +181,4 @@ object double:
181181
* ```
182182
* @syntax markdown
183183
*/
184-
type ToFloat[+X <: Double] <: Float
184+
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
@@ -11,7 +11,7 @@ object float:
1111
* ```
1212
* @syntax markdown
1313
*/
14-
type +[+X <: Float, +Y <: Float] <: Float
14+
type +[X <: Float, Y <: Float] <: Float
1515

1616
/** Subtraction of two `Float` singleton types.
1717
* ```scala
@@ -22,7 +22,7 @@ object float:
2222
* ```
2323
* @syntax markdown
2424
*/
25-
type -[+X <: Float, +Y <: Float] <: Float
25+
type -[X <: Float, Y <: Float] <: Float
2626

2727
/** Multiplication of two `Float` singleton types.
2828
* ```scala
@@ -33,7 +33,7 @@ object float:
3333
* ```
3434
* @syntax markdown
3535
*/
36-
type *[+X <: Float, +Y <: Float] <: Float
36+
type *[X <: Float, Y <: Float] <: Float
3737

3838
/** Integer division of two `Float` singleton types.
3939
* ```scala
@@ -44,7 +44,7 @@ object float:
4444
* ```
4545
* @syntax markdown
4646
*/
47-
type /[+X <: Float, +Y <: Float] <: Float
47+
type /[X <: Float, Y <: Float] <: Float
4848

4949
/** Remainder of the division of `X` by `Y`.
5050
* ```scala
@@ -55,7 +55,7 @@ object float:
5555
* ```
5656
* @syntax markdown
5757
*/
58-
type %[+X <: Float, +Y <: Float] <: Float
58+
type %[X <: Float, Y <: Float] <: Float
5959

6060
/** Less-than comparison of two `Float` singleton types.
6161
* ```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
/** Greater-than comparison of two `Float` singleton types.
7373
* ```scala
@@ -79,7 +79,7 @@ object float:
7979
* ```
8080
* @syntax markdown
8181
*/
82-
type >[+X <: Float, +Y <: Float] <: Boolean
82+
type >[X <: Float, Y <: Float] <: Boolean
8383

8484
/** Greater-or-equal comparison of two `Float` singleton types.
8585
* ```scala
@@ -91,7 +91,7 @@ object float:
9191
* ```
9292
* @syntax markdown
9393
*/
94-
type >=[+X <: Float, +Y <: Float] <: Boolean
94+
type >=[X <: Float, Y <: Float] <: Boolean
9595

9696
/** Less-or-equal comparison of two `Float` singleton types.
9797
* ```scala
@@ -103,7 +103,7 @@ object float:
103103
* ```
104104
* @syntax markdown
105105
*/
106-
type <=[+X <: Float, +Y <: Float] <: Boolean
106+
type <=[X <: Float, Y <: Float] <: Boolean
107107

108108
/** Absolute value of an `Float` singleton type.
109109
* ```scala
@@ -114,7 +114,7 @@ object float:
114114
* ```
115115
* @syntax markdown
116116
*/
117-
type Abs[+X <: Float] <: Float
117+
type Abs[X <: Float] <: Float
118118

119119
/** Negation of an `Float` singleton type.
120120
* ```scala
@@ -126,7 +126,7 @@ object float:
126126
* ```
127127
* @syntax markdown
128128
*/
129-
type Negate[+X <: Float] <: Float
129+
type Negate[X <: Float] <: Float
130130

131131
/** Minimum of two `Float` singleton types.
132132
* ```scala
@@ -137,7 +137,7 @@ object float:
137137
* ```
138138
* @syntax markdown
139139
*/
140-
type Min[+X <: Float, +Y <: Float] <: Float
140+
type Min[X <: Float, Y <: Float] <: Float
141141

142142
/** Maximum of two `Float` singleton types.
143143
* ```scala
@@ -148,7 +148,7 @@ object float:
148148
* ```
149149
* @syntax markdown
150150
*/
151-
type Max[+X <: Float, +Y <: Float] <: Float
151+
type Max[X <: Float, Y <: Float] <: Float
152152

153153
/** Int conversion of a `Float` singleton type.
154154
* ```scala
@@ -159,7 +159,7 @@ object float:
159159
* ```
160160
* @syntax markdown
161161
*/
162-
type ToInt[+X <: Float] <: Int
162+
type ToInt[X <: Float] <: Int
163163

164164
/** Long conversion of a `Float` singleton type.
165165
* ```scala
@@ -170,7 +170,7 @@ object float:
170170
* ```
171171
* @syntax markdown
172172
*/
173-
type ToLong[+X <: Float] <: Long
173+
type ToLong[X <: Float] <: Long
174174

175175
/** Double conversion of a `Float` singleton type.
176176
* ```scala
@@ -181,4 +181,4 @@ object float:
181181
* ```
182182
* @syntax markdown
183183
*/
184-
type ToDouble[+X <: Float] <: Double
184+
type ToDouble[X <: Float] <: Double

0 commit comments

Comments
 (0)