diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2017-04-10 10:58:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-10 10:58:22 +0200 |
commit | d9c3bd53433f202f0123733613baf3a382076323 (patch) | |
tree | a9c6c5858a59bc4e4144bbc5887245f3365db65a /test/files/neg/specification-scopes.check | |
parent | 1ef37f0bc18be5ed2ca8c33c0ea1912eed5dac3e (diff) | |
parent | ed63344a2dae7731c01737102fbe12b7ad10ba77 (diff) | |
download | scala-d9c3bd53433f202f0123733613baf3a382076323.tar.gz scala-d9c3bd53433f202f0123733613baf3a382076323.tar.bz2 scala-d9c3bd53433f202f0123733613baf3a382076323.zip |
Merge pull request #5838 from som-snytt/issue/2458
SI-2458 Make spec example live test
Diffstat (limited to 'test/files/neg/specification-scopes.check')
-rw-r--r-- | test/files/neg/specification-scopes.check | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/files/neg/specification-scopes.check b/test/files/neg/specification-scopes.check index ab986135e5..49cdbf9232 100644 --- a/test/files/neg/specification-scopes.check +++ b/test/files/neg/specification-scopes.check @@ -1,12 +1,12 @@ -P_2.scala:14: error: reference to x is ambiguous; -it is both defined in object C and imported subsequently by -import Q.X._ - println("L14: "+x) // reference to 'x' is ambiguous here - ^ -P_2.scala:19: error: reference to y is ambiguous; +P_2.scala:15: error: reference to x is ambiguous; +it is both defined in value <local Y> and imported subsequently by +import q.X._ + println(s"L15: $x") // reference to `x' is ambiguous here + ^ +P_2.scala:21: error: reference to y is ambiguous; it is imported twice in the same scope by -import P.X._ +import p.X._ and import X.y - println("L19: "+y) // reference to 'y' is ambiguous here - ^ + println(s"L21: $y") // reference to `y' is ambiguous here + ^ two errors found |