diff options
author | Adriaan Moors <adriaan@lightbend.com> | 2017-04-08 10:13:21 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-08 10:13:21 -0700 |
commit | 1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (patch) | |
tree | 504be1953b98540b72cf4932b66a1c1143f4f00a /test/files/run/repl-colon-type.check | |
parent | 2261f3ef4f7b2e0d14b3c2463db5878029bc5d8e (diff) | |
parent | 0d88720aea13c3a1f136f0caa7346eefe64610ec (diff) | |
download | scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.gz scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.tar.bz2 scala-1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e.zip |
Merge pull request #5837 from adriaanm/merge-2.11.x-into-2.12.x
Catch up with 2.11.x
Diffstat (limited to 'test/files/run/repl-colon-type.check')
-rw-r--r-- | test/files/run/repl-colon-type.check | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/repl-colon-type.check b/test/files/run/repl-colon-type.check index 5b7a3c7506..1217e8d8c2 100644 --- a/test/files/run/repl-colon-type.check +++ b/test/files/run/repl-colon-type.check @@ -75,7 +75,7 @@ TypeRef( ) TypeRef( TypeSymbol( - sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable + sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable ) args = List( @@ -142,7 +142,7 @@ TypeRef( args = List( TypeRef( TypeSymbol( - sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable + sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable ) args = List( @@ -175,7 +175,7 @@ PolyType( args = List( TypeRef( TypeSymbol( - sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable + sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable ) args = List(TypeParamTypeRef(TypeParam(T <: AnyVal))) @@ -198,7 +198,7 @@ PolyType( params = List(TermSymbol(x: T), TermSymbol(y: List[U])) resultType = TypeRef( TypeSymbol( - sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with FilteredTraversableInternal[A,List[A]] with Serializable + sealed abstract class List[+A] extends AbstractSeq[A] with LinearSeq[A] with Product with GenericTraversableTemplate[A,List] with LinearSeqOptimized[A,List[A]] with Serializable ) args = List(TypeParamTypeRef(TypeParam(U >: T))) |