diff options
| author | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-08-16 10:22:25 +0200 |
|---|---|---|
| committer | Lukas Rytz <lukas.rytz@epfl.ch> | 2012-08-16 14:24:14 +0200 |
| commit | ffa9b1afc9168e699cfa568a94f84e40b5cc62b7 (patch) | |
| tree | 389408cc60c0eacee6059b0e4178ccdd61ce1e12 /test/files/run/t2886.check | |
| parent | 3ccaa1026e7e74d99fe39c9608e28c48b422e2c9 (diff) | |
| parent | e05122cdb38c5c6bd4900247f371fa23b46f9c22 (diff) | |
| download | scala-ffa9b1afc9168e699cfa568a94f84e40b5cc62b7.tar.gz scala-ffa9b1afc9168e699cfa568a94f84e40b5cc62b7.tar.bz2 scala-ffa9b1afc9168e699cfa568a94f84e40b5cc62b7.zip | |
Merge remote-tracking branch 'upstream/2.10.x' into merge-210
Required a few changes of `HIDDEN` -> `ARTIFACT` and `isHidden` -> `isArtifact`
Conflicts:
src/reflect/scala/reflect/internal/Flags.scala
Diffstat (limited to 'test/files/run/t2886.check')
| -rw-r--r-- | test/files/run/t2886.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/run/t2886.check b/test/files/run/t2886.check index b093815562..cb0db8a6dc 100644 --- a/test/files/run/t2886.check +++ b/test/files/run/t2886.check @@ -1,5 +1,5 @@ ((x: String) => { - <hidden> val x$1 = x; - <hidden> val x$2 = x; + <artifact> val x$1 = x; + <artifact> val x$2 = x; Test.this.test(x$2, x$1) }) |