Skip to content

Commit 334636e

Browse files
committed
fix more review feedback
1 parent c49ad7f commit 334636e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

compiler/src/dotty/tools/dotc/plugins/Plugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ object Plugin {
8080
Success[AnyClass](loader loadClass classname)
8181
} catch {
8282
case NonFatal(e) =>
83-
Failure(new PluginLoadException(classname, s"Error: unable to load class: $classname"))
83+
Failure(new PluginLoadException(classname, s"Error: unable to load class $classname: ${e.getMessage}"))
8484
case e: NoClassDefFoundError =>
8585
Failure(new PluginLoadException(classname, s"Error: class not found: ${e.getMessage} required by $classname"))
8686
}

compiler/src/dotty/tools/dotc/plugins/Plugins.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ object Plugins {
149149
type OrderingReq = (Set[Class[_]], Set[Class[_]])
150150

151151
val orderRequirements = MMap[Class[_], OrderingReq]()
152-
val primitivePhases = plan.flatMap(ps => ps.map(_.getClass.asInstanceOf[Class[_]])).toSet
152+
val primitivePhases = plan.flatMap(ps => ps.map(_.getClass : Class[_])).toSet
153153

154154
def isPrimitive(phase: Class[_]): Boolean = primitivePhases.contains(phase)
155155

@@ -239,19 +239,19 @@ object Plugins {
239239
var runsAfter = runsAfter1 & insertedPhase
240240
val runsBefore = runsBefore1 & insertedPhase
241241

242-
// beforeReq met after the split
242+
// runsBefore met after the split
243243
val (before, after) = updatedPlan.span { ps =>
244244
val classes = ps.map(_.getClass)
245245
val runsAfterSat = runsAfter.isEmpty
246246
runsAfter = runsAfter -- classes
247-
// Prefer the point immediately before the first beforePhases.
248-
// If beforePhases not specified, insert at the point immediately
247+
// Prefer the point immediately before the first runsBefore.
248+
// If runsBefore not specified, insert at the point immediately
249249
// after the last afterPhases.
250250
!classes.exists(runsBefore.contains) &&
251251
!(runsBefore.isEmpty && runsAfterSat)
252252
}
253253

254-
// check afterReq
254+
// check runsAfter
255255
// error can occur if: a < b, b < c, c < a
256256
after.foreach { ps =>
257257
val classes = ps.map(_.getClass)

0 commit comments

Comments
 (0)