summaryrefslogtreecommitdiff
path: root/src/repl
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-11-22 03:12:36 -0800
committerJason Zaugg <jzaugg@gmail.com>2013-11-22 03:12:36 -0800
commit666f39d3493ee633a616c40f1c41add1190a3a40 (patch)
treea62015e39bfdd6235bdcf0bef31fc31342ea60b6 /src/repl
parent42657a6918ef7d6fd3f36838739ec8a3b64744a3 (diff)
parentb004c3ddb38f8e690a0895a51ad0c83ff57a01e7 (diff)
downloadscala-666f39d3493ee633a616c40f1c41add1190a3a40.tar.gz
scala-666f39d3493ee633a616c40f1c41add1190a3a40.tar.bz2
scala-666f39d3493ee633a616c40f1c41add1190a3a40.zip
Merge pull request #3131 from densh/pr/deprecate-pair-and-triple
Deprecate Pair and Triple
Diffstat (limited to 'src/repl')
-rw-r--r--src/repl/scala/tools/nsc/interpreter/JavapClass.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repl/scala/tools/nsc/interpreter/JavapClass.scala b/src/repl/scala/tools/nsc/interpreter/JavapClass.scala
index 50c90968af..496d5face1 100644
--- a/src/repl/scala/tools/nsc/interpreter/JavapClass.scala
+++ b/src/repl/scala/tools/nsc/interpreter/JavapClass.scala
@@ -180,7 +180,7 @@ class JavapClass(
/** Base class for javap tool adapters for java 6 and 7. */
abstract class JavapTool {
type ByteAry = Array[Byte]
- type Input = Pair[String, Try[ByteAry]]
+ type Input = Tuple2[String, Try[ByteAry]]
/** Run the tool. */
def apply(raw: Boolean, options: Seq[String])(inputs: Seq[Input]): List[JpResult]