Skip to content

Commit 4e437f7

Browse files
author
Adriaan Moors
committed
Merge 2.10.x
Conflicts: src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala src/compiler/scala/tools/nsc/transform/SpecializeTypes.scala src/compiler/scala/tools/nsc/typechecker/Infer.scala test/files/neg/unchecked2.check
2 parents 2dbeff0 + 1f95d35 commit 4e437f7

File tree

98 files changed

+729
-464
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+729
-464
lines changed

‎build.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ INITIALISATION
280280
<!-- Resolve maven dependencies -->
281281
<target name="init.maven.jars" depends="init.maven.tasks">
282282
<artifact:dependencies pathId="dependency.classpath" filesetId="dependency.fileset">
283-
<dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/>
283+
<!--<dependency groupId="com.typesafe" artifactId="config" version="0.4.0"/>-->
284284
</artifact:dependencies>
285285
</target>
286286

@@ -1294,7 +1294,7 @@ QUICK BUILD (QUICK)
12941294
<scalacfork
12951295
destdir="${build-quick.dir}/classes/scalacheck"
12961296
compilerpathref="quick.classpath"
1297-
params="${scalac.args.quick}"
1297+
params="${scalac.args.quick} -nowarn"
12981298
srcdir="${src.dir}/scalacheck"
12991299
jvmargs="${scalacfork.jvmargs}">
13001300
<include name="**/*.scala"/>
@@ -1942,7 +1942,7 @@ BOOTSTRAPPING BUILD (STRAP)
19421942
<scalacfork
19431943
destdir="${build-strap.dir}/classes/scalacheck"
19441944
compilerpathref="pack.classpath"
1945-
params="${scalac.args.quick}"
1945+
params="${scalac.args.quick} -nowarn"
19461946
srcdir="${src.dir}/scalacheck"
19471947
jvmargs="${scalacfork.jvmargs}">
19481948
<include name="**/*.scala"/>

‎src/actors-migration/scala/actors/Pattern.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package scala.actors
22

33
import scala.concurrent.util.Duration
4+
import language.implicitConversions
45

56
object pattern {
67

‎src/actors-migration/scala/actors/StashingActor.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package scala.actors
33
import scala.collection._
44
import scala.concurrent.util.Duration
55
import java.util.concurrent.TimeUnit
6+
import language.implicitConversions
67

78
object StashingActor extends Combinators {
89
implicit def mkBody[A](body: => A) = new InternalActor.Body[A] {

‎src/actors-migration/scala/actors/Timeout.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package scala.actors
1010

1111
import scala.concurrent.util.Duration
1212
import java.util.concurrent.TimeUnit
13+
import language.implicitConversions
1314

1415
case class Timeout(duration: Duration) {
1516
def this(timeout: Long) = this(Duration(timeout, TimeUnit.MILLISECONDS))

‎src/actors/scala/actors/AbstractActor.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
** |/ **
77
\* */
88

9-
109
package scala.actors
1110

11+
import language.higherKinds
12+
1213
/**
1314
* @author Philipp Haller
1415
*

‎src/actors/scala/actors/Actor.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
31
/* __ *\
42
** ________ ___ / / ___ Scala API **
53
** / __/ __// _ | / / / _ | (c) 2005-2011, LAMP/EPFL **
@@ -12,6 +10,7 @@ package scala.actors
1210

1311
import scala.util.control.ControlThrowable
1412
import java.util.{Timer, TimerTask}
13+
import language.implicitConversions
1514

1615
/**
1716
* Provides functions for the definition of actors, as well as actor

‎src/actors/scala/actors/CanReply.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
** |/ **
77
\* */
88

9-
109
package scala.actors
1110

11+
import language.higherKinds
12+
1213
/**
1314
* Defines result-bearing message send operations.
1415
*

‎src/actors/scala/actors/Combinators.scala

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
package scala.actors
1212

13+
import language.implicitConversions
14+
1315
private[actors] trait Combinators {
1416

1517
/**

‎src/actors/scala/actors/MQueue.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private[actors] class MQueue[Msg >: Null](protected val label: String) {
121121
* or `'''null'''` if `p` fails for all of them.
122122
*/
123123
def extractFirst(p: (Msg, OutputChannel[Any]) => Boolean): MQueueElement[Msg] =
124-
removeInternal(0)(p) orNull
124+
removeInternal(0)(p).orNull
125125

126126
def extractFirst(pf: PartialFunction[Msg, Any]): MQueueElement[Msg] = {
127127
if (isEmpty) // early return

‎src/actors/scala/actors/Reactor.scala

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ package scala.actors
1212
import scala.actors.scheduler.{DelegatingScheduler, ExecutorScheduler,
1313
ForkJoinScheduler, ThreadPoolConfig}
1414
import java.util.concurrent.{ThreadPoolExecutor, TimeUnit, LinkedBlockingQueue}
15+
import language.implicitConversions
1516

1617
private[actors] object Reactor {
1718

0 commit comments

Comments
 (0)