@@ -26,7 +26,7 @@ public enum ModuleError: Swift.Error {
26
26
/// Describes a way in which a package layout is invalid.
27
27
public enum InvalidLayoutType {
28
28
case multipleSourceRoots( [ String ] )
29
- case invalidLayout ( [ String ] )
29
+ case unexpectedSourceFiles ( [ String ] )
30
30
}
31
31
32
32
/// A module was marked as being dependent on an executable.
@@ -62,7 +62,7 @@ extension ModuleError.InvalidLayoutType: FixableError {
62
62
switch self {
63
63
case . multipleSourceRoots( let paths) :
64
64
return " multiple source roots found: " + paths. sorted ( ) . joined ( separator: " , " )
65
- case . invalidLayout ( let paths) :
65
+ case . unexpectedSourceFiles ( let paths) :
66
66
return " unexpected source file(s) found: " + paths. sorted ( ) . joined ( separator: " , " )
67
67
}
68
68
}
@@ -71,7 +71,7 @@ extension ModuleError.InvalidLayoutType: FixableError {
71
71
switch self {
72
72
case . multipleSourceRoots( _) :
73
73
return " remove the extra source roots, or add them to the source root exclude list "
74
- case . invalidLayout ( _) :
74
+ case . unexpectedSourceFiles ( _) :
75
75
return " move the file(s) inside a module "
76
76
}
77
77
}
@@ -354,7 +354,7 @@ public struct PackageBuilder {
354
354
if srcDir != packagePath {
355
355
let invalidRootFiles = try directoryContents ( packagePath) . filter ( isValidSource)
356
356
guard invalidRootFiles. isEmpty else {
357
- throw ModuleError . invalidLayout ( . invalidLayout ( invalidRootFiles. map { $0. asString } ) )
357
+ throw ModuleError . invalidLayout ( . unexpectedSourceFiles ( invalidRootFiles. map { $0. asString } ) )
358
358
}
359
359
}
360
360
@@ -365,7 +365,7 @@ public struct PackageBuilder {
365
365
if potentialModulePaths. count == 1 && potentialModulePaths [ 0 ] != srcDir {
366
366
let invalidModuleFiles = try directoryContents ( srcDir) . filter ( isValidSource)
367
367
guard invalidModuleFiles. isEmpty else {
368
- throw ModuleError . invalidLayout ( . invalidLayout ( invalidModuleFiles. map { $0. asString } ) )
368
+ throw ModuleError . invalidLayout ( . unexpectedSourceFiles ( invalidModuleFiles. map { $0. asString } ) )
369
369
}
370
370
}
371
371
0 commit comments