File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 11
11
import PackageType
12
12
13
13
extension Package {
14
- public enum Error : ErrorType {
14
+ public enum ModuleError : ErrorType {
15
15
case NoModules( Package )
16
16
case ModuleNotFound( String )
17
17
case InvalidLayout( InvalidLayoutType )
Original file line number Diff line number Diff line change @@ -23,15 +23,15 @@ extension Package {
23
23
24
24
if srcroot != path {
25
25
guard walk ( path, recursively: false ) . filter ( isValidSource) . isEmpty else {
26
- throw Error . InvalidLayout ( . InvalidLayout)
26
+ throw ModuleError . InvalidLayout ( . InvalidLayout)
27
27
}
28
28
}
29
29
30
30
let maybeModules = walk ( srcroot, recursively: false ) . filter ( shouldConsiderDirectory)
31
31
32
32
if maybeModules. count == 1 && maybeModules [ 0 ] != srcroot {
33
33
guard walk ( srcroot, recursively: false ) . filter ( isValidSource) . isEmpty else {
34
- throw Error . InvalidLayout ( . InvalidLayout)
34
+ throw ModuleError . InvalidLayout ( . InvalidLayout)
35
35
}
36
36
}
37
37
@@ -40,7 +40,7 @@ extension Package {
40
40
do {
41
41
modules = [ SwiftModule ( name: self . name, sources: try sourcify ( srcroot) ) ]
42
42
} catch Module . Error . NoSources {
43
- throw Error . NoModules ( self )
43
+ throw ModuleError . NoModules ( self )
44
44
}
45
45
} else {
46
46
modules = try maybeModules. map ( sourcify) . map { sources in
@@ -65,7 +65,7 @@ extension Package {
65
65
switch $0 {
66
66
case . Target( let name) :
67
67
guard let module = moduleForName ( name) else {
68
- throw Error . ModuleNotFound ( name)
68
+ throw ModuleError . ModuleNotFound ( name)
69
69
}
70
70
return module
71
71
}
Original file line number Diff line number Diff line change @@ -30,7 +30,7 @@ extension Package {
30
30
return viableRoots [ 0 ]
31
31
default :
32
32
// eg. there is a `Sources' AND a `src'
33
- throw Error . InvalidLayout ( . MultipleSourceRoots( viableRoots) )
33
+ throw ModuleError . InvalidLayout ( . MultipleSourceRoots( viableRoots) )
34
34
}
35
35
}
36
36
}
You can’t perform that action at this time.
0 commit comments