Skip to content

Commit b94ddfb

Browse files
committed
wip
1 parent ec853af commit b94ddfb

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

runner/meta/src/mill/meta/CodeGen.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ object CodeGen {
3030
// Provide `build` as an alias to the root `build_.package_`, since from the user's
3131
// perspective it looks like they're writing things that live in `package build`,
3232
// but at compile-time we rename things, we so provide an alias to preserve the fiction
33-
val aliasImports = "import build_.{package_ => build}"
33+
3434

3535
for (scriptPath <- scriptSources) {
3636
val scriptFolderPath = scriptPath / os.up
@@ -371,7 +371,7 @@ object CodeGen {
371371
)
372372

373373
newScriptCode = objectData.name.applyTo(newScriptCode, CGConst.wrapperObjectName)
374-
newScriptCode = objectData.obj.applyTo(newScriptCode, "abstract class")
374+
newScriptCode = objectData.obj.applyTo(newScriptCode, "trait")
375375

376376
s"""$headerCode
377377
|$markerComment
@@ -380,7 +380,7 @@ object CodeGen {
380380

381381
case None =>
382382
s"""$headerCode
383-
|abstract class ${CGConst.wrapperObjectName}
383+
|trait ${CGConst.wrapperObjectName}
384384
| extends $newParent { this: ${CGConst.wrapperObjectName}.type =>
385385
|$markerComment
386386
|$scriptCode

runner/meta/src/mill/meta/FileImportGraph.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@ import mill.internal.Util.backtickWrap
1717
* @param metaBuild If `true`, a meta-build is enabled
1818
*/
1919
@internal
20-
case class FileImportGraph(seenScripts: Map[os.Path, String],
21-
errors: Seq[String],
22-
seenPkgStatements: Map[os.Path, String])
20+
case class FileImportGraph(
21+
seenScripts: Map[os.Path, String],
22+
errors: Seq[String],
23+
seenPkgStatements: Map[os.Path, String]
24+
)
2325

2426
/**
2527
* Logic around traversing the `import $file` graph, extracting necessary info

0 commit comments

Comments
 (0)