Skip to content

Commit 1b1ff45

Browse files
committed
Make IntelliJ happy on the name clash in Scala 2.13 Maven project
1 parent 7363cb5 commit 1b1ff45

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/test/scala/com/github/yruslan/channel/ChannelSuite.scala

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,8 @@ class ChannelSuite extends AnyWordSpec with BeforeAndAfterAll {
677677
"ping pong messages between 2 workers" in {
678678
val actions = new StringBuffer()
679679

680-
def worker(workerNum: Int, ch: Channel[Int]): Unit = {
680+
/* Full qualified name 'com.github.yruslan.channel.Channel' is used here to make IntelliJ IDEA happy. */
681+
def worker(workerNum: Int, ch: com.github.yruslan.channel.Channel[Int]): Unit = {
681682
for (i <- Range(0, 10)) {
682683
val k = select(
683684
ch.recver(n => {
@@ -964,7 +965,10 @@ class ChannelSuite extends AnyWordSpec with BeforeAndAfterAll {
964965

965966
"master/worker model" should {
966967
// Worker that operates on 2 channels
967-
def worker2(workerNum: Int, results: ListBuffer[String], channell: Channel[Int], channel2: Channel[String]): Unit = {
968+
def worker2(workerNum: Int,
969+
results: ListBuffer[String],
970+
channell: ReadChannel[Int],
971+
channel2: ReadChannel[String]): Unit = {
968972
while (!channell.isClosed && !channel2.isClosed) {
969973
select(
970974
channell.recver { v =>

src/test/scala/com/github/yruslan/channel/GuaranteesSuite.scala

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,11 @@ class GuaranteesSuite extends AnyWordSpec {
118118
}
119119
}
120120

121-
private def testFairness(in1: Channel[Int], in2: Channel[Int], out1: Channel[Int], out2: Channel[Int]): Unit = {
121+
/* Full qualified name 'com.github.yruslan.channel.Channel' is used here to make IntelliJ IDEA happy. */
122+
private def testFairness(in1: com.github.yruslan.channel.Channel[Int],
123+
in2: com.github.yruslan.channel.Channel[Int],
124+
out1: com.github.yruslan.channel.Channel[Int],
125+
out2: com.github.yruslan.channel.Channel[Int]): Unit = {
122126
val results = new ListBuffer[(Int, Int)]
123127

124128
def balancer(input1: ReadChannel[Int], input2: ReadChannel[Int], output1: WriteChannel[Int], output2: WriteChannel[Int], finishChannel: ReadChannel[Boolean]): Unit = {

0 commit comments

Comments
 (0)