Skip to content

Commit d38eb74

Browse files
smartersmarter
committed
Upgrade to Scala 2.12.7
The Iterator#toString change comes from scala/scala#6668
1 parent 19cdeb4 commit d38eb74

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

‎compiler/test-resources/type-printer/prefixless

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ val res2: Seq[Char] = List(a, b)
77
scala> Set(4, 5)
88
val res3: Set[Int] = Set(4, 5)
99
scala> Iterator(1)
10-
val res4: Iterator[Int] = non-empty iterator
10+
val res4: Iterator[Int] = <iterator>

‎project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ object ExposedValues extends AutoPlugin {
3636
object Build {
3737

3838
val baseVersion = "0.10.0"
39-
val scalacVersion = "2.12.6"
39+
val scalacVersion = "2.12.7"
4040

4141
val dottyOrganization = "ch.epfl.lamp"
4242
val dottyGithubUrl = "https://github.com/lampepfl/dotty"

‎tests/run/t8690.check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
non-empty iterator
1+
<iterator>
22
abcdef

‎tests/run/view-iterator-stream.check

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,109 +4,109 @@
44
-------------------
55
toIndexedSeq -> toIterator -> toStream Stream(22, ?) 22 23 24 25
66
toIndexedSeq -> toIterator -> view StreamView(...) 22 23 24 25
7-
toIndexedSeq -> toStream -> toIterator non-empty iterator 22 23 24 25
7+
toIndexedSeq -> toStream -> toIterator <iterator> 22 23 24 25
88
toIndexedSeq -> toStream -> view StreamView(...) 22 23 24 25
9-
toIndexedSeq -> view -> toIterator non-empty iterator 22 23 24 25
9+
toIndexedSeq -> view -> toIterator <iterator> 22 23 24 25
1010
toIndexedSeq -> view -> toStream Stream(22, ?) 22 23 24 25
1111
toIterator -> toIndexedSeq -> toStream Stream(22, ?) 22 23 24 25
1212
toIterator -> toIndexedSeq -> view SeqView(...) 22 23 24 25
1313
toIterator -> toStream -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
1414
toIterator -> toStream -> view StreamView(...) 22 23 24 25
1515
toIterator -> view -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
1616
toIterator -> view -> toStream Stream(22, ?) 22 23 24 25
17-
toStream -> toIndexedSeq -> toIterator non-empty iterator 22 23 24 25
17+
toStream -> toIndexedSeq -> toIterator <iterator> 22 23 24 25
1818
toStream -> toIndexedSeq -> view SeqView(...) 22 23 24 25
1919
toStream -> toIterator -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
2020
toStream -> toIterator -> view StreamView(...) 22 23 24 25
2121
toStream -> view -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
22-
toStream -> view -> toIterator non-empty iterator 22 23 24 25
23-
view -> toIndexedSeq -> toIterator non-empty iterator 22 23 24 25
22+
toStream -> view -> toIterator <iterator> 22 23 24 25
23+
view -> toIndexedSeq -> toIterator <iterator> 22 23 24 25
2424
view -> toIndexedSeq -> toStream Stream(22, ?) 22 23 24 25
2525
view -> toIterator -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
2626
view -> toIterator -> toStream Stream(22, ?) 22 23 24 25
2727
view -> toStream -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
28-
view -> toStream -> toIterator non-empty iterator 22 23 24 25
28+
view -> toStream -> toIterator <iterator> 22 23 24 25
2929

3030
** take 20 -> drop 10 -> slice(1, 5) **
3131

3232
-------------------
3333
toIndexedSeq -> toIterator -> toStream Stream(12, ?) 12 13 14 15
3434
toIndexedSeq -> toIterator -> view StreamView(...) 12 13 14 15
35-
toIndexedSeq -> toStream -> toIterator non-empty iterator 12 13 14 15
35+
toIndexedSeq -> toStream -> toIterator <iterator> 12 13 14 15
3636
toIndexedSeq -> toStream -> view StreamView(...) 12 13 14 15
37-
toIndexedSeq -> view -> toIterator non-empty iterator 12 13 14 15
37+
toIndexedSeq -> view -> toIterator <iterator> 12 13 14 15
3838
toIndexedSeq -> view -> toStream Stream(12, ?) 12 13 14 15
3939
toIterator -> toIndexedSeq -> toStream Stream(12, ?) 12 13 14 15
4040
toIterator -> toIndexedSeq -> view SeqView(...) 12 13 14 15
4141
toIterator -> toStream -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
4242
toIterator -> toStream -> view StreamView(...) 12 13 14 15
4343
toIterator -> view -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
4444
toIterator -> view -> toStream Stream(12, ?) 12 13 14 15
45-
toStream -> toIndexedSeq -> toIterator non-empty iterator 12 13 14 15
45+
toStream -> toIndexedSeq -> toIterator <iterator> 12 13 14 15
4646
toStream -> toIndexedSeq -> view SeqView(...) 12 13 14 15
4747
toStream -> toIterator -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
4848
toStream -> toIterator -> view StreamView(...) 12 13 14 15
4949
toStream -> view -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
50-
toStream -> view -> toIterator non-empty iterator 12 13 14 15
51-
view -> toIndexedSeq -> toIterator non-empty iterator 12 13 14 15
50+
toStream -> view -> toIterator <iterator> 12 13 14 15
51+
view -> toIndexedSeq -> toIterator <iterator> 12 13 14 15
5252
view -> toIndexedSeq -> toStream Stream(12, ?) 12 13 14 15
5353
view -> toIterator -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
5454
view -> toIterator -> toStream Stream(12, ?) 12 13 14 15
5555
view -> toStream -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
56-
view -> toStream -> toIterator non-empty iterator 12 13 14 15
56+
view -> toStream -> toIterator <iterator> 12 13 14 15
5757

5858
** slice(20, 40) -> drop 10 -> take 5 **
5959

6060
-------------------
6161
toIndexedSeq -> toIterator -> toStream Stream(31, ?) 31 32 33 34 35
6262
toIndexedSeq -> toIterator -> view StreamView(...) 31 32 33 34 35
63-
toIndexedSeq -> toStream -> toIterator non-empty iterator 31 32 33 34 35
63+
toIndexedSeq -> toStream -> toIterator <iterator> 31 32 33 34 35
6464
toIndexedSeq -> toStream -> view StreamView(...) 31 32 33 34 35
65-
toIndexedSeq -> view -> toIterator non-empty iterator 31 32 33 34 35
65+
toIndexedSeq -> view -> toIterator <iterator> 31 32 33 34 35
6666
toIndexedSeq -> view -> toStream Stream(31, ?) 31 32 33 34 35
6767
toIterator -> toIndexedSeq -> toStream Stream(31, ?) 31 32 33 34 35
6868
toIterator -> toIndexedSeq -> view SeqView(...) 31 32 33 34 35
6969
toIterator -> toStream -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
7070
toIterator -> toStream -> view StreamView(...) 31 32 33 34 35
7171
toIterator -> view -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
7272
toIterator -> view -> toStream Stream(31, ?) 31 32 33 34 35
73-
toStream -> toIndexedSeq -> toIterator non-empty iterator 31 32 33 34 35
73+
toStream -> toIndexedSeq -> toIterator <iterator> 31 32 33 34 35
7474
toStream -> toIndexedSeq -> view SeqView(...) 31 32 33 34 35
7575
toStream -> toIterator -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
7676
toStream -> toIterator -> view StreamView(...) 31 32 33 34 35
7777
toStream -> view -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
78-
toStream -> view -> toIterator non-empty iterator 31 32 33 34 35
79-
view -> toIndexedSeq -> toIterator non-empty iterator 31 32 33 34 35
78+
toStream -> view -> toIterator <iterator> 31 32 33 34 35
79+
view -> toIndexedSeq -> toIterator <iterator> 31 32 33 34 35
8080
view -> toIndexedSeq -> toStream Stream(31, ?) 31 32 33 34 35
8181
view -> toIterator -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
8282
view -> toIterator -> toStream Stream(31, ?) 31 32 33 34 35
8383
view -> toStream -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
84-
view -> toStream -> toIterator non-empty iterator 31 32 33 34 35
84+
view -> toStream -> toIterator <iterator> 31 32 33 34 35
8585

8686
** slice(20, 40) -> take 10 -> drop 5 **
8787

8888
-------------------
8989
toIndexedSeq -> toIterator -> toStream Stream(26, ?) 26 27 28 29 30
9090
toIndexedSeq -> toIterator -> view StreamView(...) 26 27 28 29 30
91-
toIndexedSeq -> toStream -> toIterator non-empty iterator 26 27 28 29 30
91+
toIndexedSeq -> toStream -> toIterator <iterator> 26 27 28 29 30
9292
toIndexedSeq -> toStream -> view StreamView(...) 26 27 28 29 30
93-
toIndexedSeq -> view -> toIterator non-empty iterator 26 27 28 29 30
93+
toIndexedSeq -> view -> toIterator <iterator> 26 27 28 29 30
9494
toIndexedSeq -> view -> toStream Stream(26, ?) 26 27 28 29 30
9595
toIterator -> toIndexedSeq -> toStream Stream(26, ?) 26 27 28 29 30
9696
toIterator -> toIndexedSeq -> view SeqView(...) 26 27 28 29 30
9797
toIterator -> toStream -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
9898
toIterator -> toStream -> view StreamView(...) 26 27 28 29 30
9999
toIterator -> view -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
100100
toIterator -> view -> toStream Stream(26, ?) 26 27 28 29 30
101-
toStream -> toIndexedSeq -> toIterator non-empty iterator 26 27 28 29 30
101+
toStream -> toIndexedSeq -> toIterator <iterator> 26 27 28 29 30
102102
toStream -> toIndexedSeq -> view SeqView(...) 26 27 28 29 30
103103
toStream -> toIterator -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
104104
toStream -> toIterator -> view StreamView(...) 26 27 28 29 30
105105
toStream -> view -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
106-
toStream -> view -> toIterator non-empty iterator 26 27 28 29 30
107-
view -> toIndexedSeq -> toIterator non-empty iterator 26 27 28 29 30
106+
toStream -> view -> toIterator <iterator> 26 27 28 29 30
107+
view -> toIndexedSeq -> toIterator <iterator> 26 27 28 29 30
108108
view -> toIndexedSeq -> toStream Stream(26, ?) 26 27 28 29 30
109109
view -> toIterator -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
110110
view -> toIterator -> toStream Stream(26, ?) 26 27 28 29 30
111111
view -> toStream -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
112-
view -> toStream -> toIterator non-empty iterator 26 27 28 29 30
112+
view -> toStream -> toIterator <iterator> 26 27 28 29 30

0 commit comments

Comments
 (0)