From 04808722f5f853acd0f6673568e348b60bf8d122 Mon Sep 17 00:00:00 2001 From: Guillaume Martres Date: Tue, 24 Mar 2020 14:20:39 +0100 Subject: [PATCH] lockfree: package matches file path The Dotty IDE gets unhappy otherwise. --- src/main/scala/lockfree/instrumentation/MockedMonitor.scala | 2 +- src/main/scala/lockfree/instrumentation/Monitor.scala | 2 +- .../scala/lockfree/instrumentation/SchedulableSortedList.scala | 2 +- src/main/scala/lockfree/instrumentation/Scheduler.scala | 2 +- src/main/scala/lockfree/instrumentation/Stats.scala | 2 +- src/main/scala/lockfree/instrumentation/TestHelper.scala | 2 +- src/main/scala/lockfree/instrumentation/TestUtils.scala | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/scala/lockfree/instrumentation/MockedMonitor.scala b/src/main/scala/lockfree/instrumentation/MockedMonitor.scala index 2ad9bc5..6b2c48b 100644 --- a/src/main/scala/lockfree/instrumentation/MockedMonitor.scala +++ b/src/main/scala/lockfree/instrumentation/MockedMonitor.scala @@ -1,4 +1,4 @@ -package instrumentation +package lockfree.instrumentation trait MockedMonitor extends Monitor { def scheduler: Scheduler diff --git a/src/main/scala/lockfree/instrumentation/Monitor.scala b/src/main/scala/lockfree/instrumentation/Monitor.scala index 82c6cf2..87fa811 100644 --- a/src/main/scala/lockfree/instrumentation/Monitor.scala +++ b/src/main/scala/lockfree/instrumentation/Monitor.scala @@ -1,4 +1,4 @@ -package instrumentation +package lockfree.instrumentation class Dummy diff --git a/src/main/scala/lockfree/instrumentation/SchedulableSortedList.scala b/src/main/scala/lockfree/instrumentation/SchedulableSortedList.scala index 5811443..5218cea 100644 --- a/src/main/scala/lockfree/instrumentation/SchedulableSortedList.scala +++ b/src/main/scala/lockfree/instrumentation/SchedulableSortedList.scala @@ -1,4 +1,4 @@ -package instrumentation +package lockfree.instrumentation import scala.annotation.tailrec import lockfree._ diff --git a/src/main/scala/lockfree/instrumentation/Scheduler.scala b/src/main/scala/lockfree/instrumentation/Scheduler.scala index 4d30606..f8f5dd2 100644 --- a/src/main/scala/lockfree/instrumentation/Scheduler.scala +++ b/src/main/scala/lockfree/instrumentation/Scheduler.scala @@ -1,4 +1,4 @@ -package instrumentation +package lockfree.instrumentation import java.util.concurrent._; import scala.concurrent.duration._ diff --git a/src/main/scala/lockfree/instrumentation/Stats.scala b/src/main/scala/lockfree/instrumentation/Stats.scala index ab221bf..0be21f2 100644 --- a/src/main/scala/lockfree/instrumentation/Stats.scala +++ b/src/main/scala/lockfree/instrumentation/Stats.scala @@ -1,5 +1,5 @@ /* Copyright 2009-2015 EPFL, Lausanne */ -package instrumentation +package lockfree.instrumentation import java.lang.management._ diff --git a/src/main/scala/lockfree/instrumentation/TestHelper.scala b/src/main/scala/lockfree/instrumentation/TestHelper.scala index f47df4f..e8a221d 100644 --- a/src/main/scala/lockfree/instrumentation/TestHelper.scala +++ b/src/main/scala/lockfree/instrumentation/TestHelper.scala @@ -1,4 +1,4 @@ -package instrumentation +package lockfree.instrumentation import scala.util.Random import scala.collection.mutable.{Map => MutableMap} diff --git a/src/main/scala/lockfree/instrumentation/TestUtils.scala b/src/main/scala/lockfree/instrumentation/TestUtils.scala index 3ab651a..478cd90 100644 --- a/src/main/scala/lockfree/instrumentation/TestUtils.scala +++ b/src/main/scala/lockfree/instrumentation/TestUtils.scala @@ -1,4 +1,4 @@ -package instrumentation +package lockfree.instrumentation import scala.concurrent._ import scala.concurrent.duration._