File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed
main/kotlin/org/jetbrains/kotlinx/dataframe/impl
test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person
main/kotlin/org/jetbrains/kotlinx/dataframe/impl
test/kotlin/org/jetbrains/kotlinx/dataframe/testSets/person Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change @@ -63,8 +63,8 @@ internal fun renderType(type: KType?): String {
6363 type.classifier in listOf (LocalDateTime ::class , LocalTime ::class ) ->
6464 fullName.removePrefix(" java.time." )
6565
66- fullName.startsWith(" kotlin.collections" ) ->
67- fullName.removePrefix(" kotlin.collections" )
66+ fullName.startsWith(" kotlin.collections. " ) ->
67+ fullName.removePrefix(" kotlin.collections. " )
6868
6969 fullName.startsWith(" kotlin." ) ->
7070 fullName.removePrefix(" kotlin." )
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ class PivotTests {
9595
9696 data[" age" ].type() shouldBe typeOf<List <Int >>()
9797 data[" city" ].type() shouldBe typeOf<String >()
98- data[" weight" ].type() shouldBe typeOf<Comparable <Any >>()
98+ data[" weight" ].type() shouldBe typeOf<Comparable <* >>() // Comparable<String + Int> -> Comparable<Nothing | *>
9999
100100 res.renderToString(columnTypes = true , title = true ) shouldBe
101101 defaultExpected.group { drop(1 ) }.into(" key" ).renderToString(columnTypes = true , title = true )
Original file line number Diff line number Diff line change @@ -63,8 +63,8 @@ internal fun renderType(type: KType?): String {
6363 type.classifier in listOf (LocalDateTime ::class , LocalTime ::class ) ->
6464 fullName.removePrefix(" java.time." )
6565
66- fullName.startsWith(" kotlin.collections" ) ->
67- fullName.removePrefix(" kotlin.collections" )
66+ fullName.startsWith(" kotlin.collections. " ) ->
67+ fullName.removePrefix(" kotlin.collections. " )
6868
6969 fullName.startsWith(" kotlin." ) ->
7070 fullName.removePrefix(" kotlin." )
Original file line number Diff line number Diff line change @@ -95,7 +95,7 @@ class PivotTests {
9595
9696 data[" age" ].type() shouldBe typeOf<List <Int >>()
9797 data[" city" ].type() shouldBe typeOf<String >()
98- data[" weight" ].type() shouldBe typeOf<Comparable <Any >>()
98+ data[" weight" ].type() shouldBe typeOf<Comparable <* >>() // Comparable<String + Int> -> Comparable<Nothing | *>
9999
100100 res.renderToString(columnTypes = true , title = true ) shouldBe
101101 defaultExpected.group { drop(1 ) }.into(" key" ).renderToString(columnTypes = true , title = true )
You can’t perform that action at this time.
0 commit comments