Skip to content

Commit ce29826

Browse files
committed
.
1 parent 960f708 commit ce29826

File tree

10 files changed

+3
-66
lines changed

10 files changed

+3
-66
lines changed

integration/failure/invalid-meta-module/resources/build.mill

Lines changed: 0 additions & 2 deletions
This file was deleted.

integration/failure/invalid-meta-module/resources/mill-build/build.mill

Lines changed: 0 additions & 3 deletions
This file was deleted.

integration/failure/invalid-meta-module/src/InvalidMetaModuleTests.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration/failure/invalid-root-module/resources/build.mill

Lines changed: 0 additions & 3 deletions
This file was deleted.

integration/failure/invalid-root-module/src/InvalidRootModuleTests.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration/failure/invalid-subfolder-root-module/resources/build.mill

Lines changed: 0 additions & 1 deletion
This file was deleted.

integration/failure/invalid-subfolder-root-module/resources/sub/package.mill

Lines changed: 0 additions & 3 deletions
This file was deleted.

integration/failure/invalid-subfolder-root-module/src/InvalidSubfolderRootModuleTests.scala

Lines changed: 0 additions & 17 deletions
This file was deleted.

integration/failure/root-module-compile-error/src/RootModuleCompileErrorTests.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ object RootModuleCompileErrorTests extends UtestIntegrationTestSuite {
1414

1515
locally {
1616
// For now these error messages still show generated/mangled code; not ideal, but it'll do
17-
assert(res.err.contains("""build.mill:7:67"""))
17+
assert(res.err.contains("""build.mill:7:26"""))
1818
assert(res.err.contains("""Not found: type UnknownRootModule"""))
1919
assert(res.err.contains(
2020
"""abstract class package_ extends _root_.mill.util.MainRootModule, UnknownRootModule {"""
@@ -26,7 +26,7 @@ object RootModuleCompileErrorTests extends UtestIntegrationTestSuite {
2626

2727
locally {
2828
// For now these error messages still show generated/mangled code; not ideal, but it'll do
29-
assert(res.err.replace('\\', '/').contains("""foo/package.mill:6:96"""))
29+
assert(res.err.replace('\\', '/').contains("""foo/package.mill:6:26"""))
3030
assert(res.err.contains("""Not found: type UnknownFooModule"""))
3131
assert(res.err.contains(
3232
"""abstract class package_ extends _root_.mill.api.internal.SubfolderModule(build.millDiscover), UnknownFooModule {"""

integration/failure/root-subfolder-module-collision/src/RootSubfolderModuleCollisionTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object RootSubfolderModuleCollisionTests extends UtestIntegrationTestSuite {
1111
val res = eval(("resolve", "_"))
1212
assert(res.isSuccess == false)
1313
assert(res.err.contains("Reference to sub is ambiguous."))
14-
assert(res.err.contains("It is both defined in class package_"))
14+
assert(res.err.contains("It is both defined in trait package_"))
1515
assert(res.err.contains("and inherited subsequently in class package_"))
1616
}
1717
}

0 commit comments

Comments
 (0)