Skip to content

Commit

Permalink
Upgrade to Scala 2.12.7
Browse files Browse the repository at this point in the history 
The Iterator#toString change comes from
scala/scala#6668
  • Loading branch information
@smarter
smarter committed Sep 27, 2018
1 parent 19cdeb4 commit d38eb74
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion compiler/test-resources/type-printer/prefixless
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ val res2: Seq[Char] = List(a, b)
scala> Set(4, 5)
val res3: Set[Int] = Set(4, 5)
scala> Iterator(1)
val res4: Iterator[Int] = non-empty iterator
val res4: Iterator[Int] = <iterator>
2 changes: 1 addition & 1 deletion project/Build.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ object ExposedValues extends AutoPlugin {
object Build {

val baseVersion = "0.10.0"
val scalacVersion = "2.12.6"
val scalacVersion = "2.12.7"

val dottyOrganization = "ch.epfl.lamp"
val dottyGithubUrl = "https://github.com/lampepfl/dotty"
Expand Down
2 changes: 1 addition & 1 deletion tests/run/t8690.check
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
non-empty iterator
<iterator>
abcdef
48 changes: 24 additions & 24 deletions tests/run/view-iterator-stream.check
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,109 +4,109 @@
-------------------
toIndexedSeq -> toIterator -> toStream Stream(22, ?) 22 23 24 25
toIndexedSeq -> toIterator -> view StreamView(...) 22 23 24 25
toIndexedSeq -> toStream -> toIterator non-empty iterator 22 23 24 25
toIndexedSeq -> toStream -> toIterator <iterator> 22 23 24 25
toIndexedSeq -> toStream -> view StreamView(...) 22 23 24 25
toIndexedSeq -> view -> toIterator non-empty iterator 22 23 24 25
toIndexedSeq -> view -> toIterator <iterator> 22 23 24 25
toIndexedSeq -> view -> toStream Stream(22, ?) 22 23 24 25
toIterator -> toIndexedSeq -> toStream Stream(22, ?) 22 23 24 25
toIterator -> toIndexedSeq -> view SeqView(...) 22 23 24 25
toIterator -> toStream -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
toIterator -> toStream -> view StreamView(...) 22 23 24 25
toIterator -> view -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
toIterator -> view -> toStream Stream(22, ?) 22 23 24 25
toStream -> toIndexedSeq -> toIterator non-empty iterator 22 23 24 25
toStream -> toIndexedSeq -> toIterator <iterator> 22 23 24 25
toStream -> toIndexedSeq -> view SeqView(...) 22 23 24 25
toStream -> toIterator -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
toStream -> toIterator -> view StreamView(...) 22 23 24 25
toStream -> view -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
toStream -> view -> toIterator non-empty iterator 22 23 24 25
view -> toIndexedSeq -> toIterator non-empty iterator 22 23 24 25
toStream -> view -> toIterator <iterator> 22 23 24 25
view -> toIndexedSeq -> toIterator <iterator> 22 23 24 25
view -> toIndexedSeq -> toStream Stream(22, ?) 22 23 24 25
view -> toIterator -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
view -> toIterator -> toStream Stream(22, ?) 22 23 24 25
view -> toStream -> toIndexedSeq Vector(22, 23, 24, 25) 22 23 24 25
view -> toStream -> toIterator non-empty iterator 22 23 24 25
view -> toStream -> toIterator <iterator> 22 23 24 25

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

-------------------
toIndexedSeq -> toIterator -> toStream Stream(12, ?) 12 13 14 15
toIndexedSeq -> toIterator -> view StreamView(...) 12 13 14 15
toIndexedSeq -> toStream -> toIterator non-empty iterator 12 13 14 15
toIndexedSeq -> toStream -> toIterator <iterator> 12 13 14 15
toIndexedSeq -> toStream -> view StreamView(...) 12 13 14 15
toIndexedSeq -> view -> toIterator non-empty iterator 12 13 14 15
toIndexedSeq -> view -> toIterator <iterator> 12 13 14 15
toIndexedSeq -> view -> toStream Stream(12, ?) 12 13 14 15
toIterator -> toIndexedSeq -> toStream Stream(12, ?) 12 13 14 15
toIterator -> toIndexedSeq -> view SeqView(...) 12 13 14 15
toIterator -> toStream -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
toIterator -> toStream -> view StreamView(...) 12 13 14 15
toIterator -> view -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
toIterator -> view -> toStream Stream(12, ?) 12 13 14 15
toStream -> toIndexedSeq -> toIterator non-empty iterator 12 13 14 15
toStream -> toIndexedSeq -> toIterator <iterator> 12 13 14 15
toStream -> toIndexedSeq -> view SeqView(...) 12 13 14 15
toStream -> toIterator -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
toStream -> toIterator -> view StreamView(...) 12 13 14 15
toStream -> view -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
toStream -> view -> toIterator non-empty iterator 12 13 14 15
view -> toIndexedSeq -> toIterator non-empty iterator 12 13 14 15
toStream -> view -> toIterator <iterator> 12 13 14 15
view -> toIndexedSeq -> toIterator <iterator> 12 13 14 15
view -> toIndexedSeq -> toStream Stream(12, ?) 12 13 14 15
view -> toIterator -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
view -> toIterator -> toStream Stream(12, ?) 12 13 14 15
view -> toStream -> toIndexedSeq Vector(12, 13, 14, 15) 12 13 14 15
view -> toStream -> toIterator non-empty iterator 12 13 14 15
view -> toStream -> toIterator <iterator> 12 13 14 15

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

-------------------
toIndexedSeq -> toIterator -> toStream Stream(31, ?) 31 32 33 34 35
toIndexedSeq -> toIterator -> view StreamView(...) 31 32 33 34 35
toIndexedSeq -> toStream -> toIterator non-empty iterator 31 32 33 34 35
toIndexedSeq -> toStream -> toIterator <iterator> 31 32 33 34 35
toIndexedSeq -> toStream -> view StreamView(...) 31 32 33 34 35
toIndexedSeq -> view -> toIterator non-empty iterator 31 32 33 34 35
toIndexedSeq -> view -> toIterator <iterator> 31 32 33 34 35
toIndexedSeq -> view -> toStream Stream(31, ?) 31 32 33 34 35
toIterator -> toIndexedSeq -> toStream Stream(31, ?) 31 32 33 34 35
toIterator -> toIndexedSeq -> view SeqView(...) 31 32 33 34 35
toIterator -> toStream -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
toIterator -> toStream -> view StreamView(...) 31 32 33 34 35
toIterator -> view -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
toIterator -> view -> toStream Stream(31, ?) 31 32 33 34 35
toStream -> toIndexedSeq -> toIterator non-empty iterator 31 32 33 34 35
toStream -> toIndexedSeq -> toIterator <iterator> 31 32 33 34 35
toStream -> toIndexedSeq -> view SeqView(...) 31 32 33 34 35
toStream -> toIterator -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
toStream -> toIterator -> view StreamView(...) 31 32 33 34 35
toStream -> view -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
toStream -> view -> toIterator non-empty iterator 31 32 33 34 35
view -> toIndexedSeq -> toIterator non-empty iterator 31 32 33 34 35
toStream -> view -> toIterator <iterator> 31 32 33 34 35
view -> toIndexedSeq -> toIterator <iterator> 31 32 33 34 35
view -> toIndexedSeq -> toStream Stream(31, ?) 31 32 33 34 35
view -> toIterator -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
view -> toIterator -> toStream Stream(31, ?) 31 32 33 34 35
view -> toStream -> toIndexedSeq Vector(31, 32, 33, 34, 35) 31 32 33 34 35
view -> toStream -> toIterator non-empty iterator 31 32 33 34 35
view -> toStream -> toIterator <iterator> 31 32 33 34 35

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

-------------------
toIndexedSeq -> toIterator -> toStream Stream(26, ?) 26 27 28 29 30
toIndexedSeq -> toIterator -> view StreamView(...) 26 27 28 29 30
toIndexedSeq -> toStream -> toIterator non-empty iterator 26 27 28 29 30
toIndexedSeq -> toStream -> toIterator <iterator> 26 27 28 29 30
toIndexedSeq -> toStream -> view StreamView(...) 26 27 28 29 30
toIndexedSeq -> view -> toIterator non-empty iterator 26 27 28 29 30
toIndexedSeq -> view -> toIterator <iterator> 26 27 28 29 30
toIndexedSeq -> view -> toStream Stream(26, ?) 26 27 28 29 30
toIterator -> toIndexedSeq -> toStream Stream(26, ?) 26 27 28 29 30
toIterator -> toIndexedSeq -> view SeqView(...) 26 27 28 29 30
toIterator -> toStream -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
toIterator -> toStream -> view StreamView(...) 26 27 28 29 30
toIterator -> view -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
toIterator -> view -> toStream Stream(26, ?) 26 27 28 29 30
toStream -> toIndexedSeq -> toIterator non-empty iterator 26 27 28 29 30
toStream -> toIndexedSeq -> toIterator <iterator> 26 27 28 29 30
toStream -> toIndexedSeq -> view SeqView(...) 26 27 28 29 30
toStream -> toIterator -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
toStream -> toIterator -> view StreamView(...) 26 27 28 29 30
toStream -> view -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
toStream -> view -> toIterator non-empty iterator 26 27 28 29 30
view -> toIndexedSeq -> toIterator non-empty iterator 26 27 28 29 30
toStream -> view -> toIterator <iterator> 26 27 28 29 30
view -> toIndexedSeq -> toIterator <iterator> 26 27 28 29 30
view -> toIndexedSeq -> toStream Stream(26, ?) 26 27 28 29 30
view -> toIterator -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
view -> toIterator -> toStream Stream(26, ?) 26 27 28 29 30
view -> toStream -> toIndexedSeq Vector(26, 27, 28, 29, 30) 26 27 28 29 30
view -> toStream -> toIterator non-empty iterator 26 27 28 29 30
view -> toStream -> toIterator <iterator> 26 27 28 29 30

0 comments on commit d38eb74

Please sign in to comment.