Skip to content

Commit 63d42ad

Browse files
committed
Refactor enum Error to ModuleError
1 parent fcb94c8 commit 63d42ad

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Sources/Transmute/Error.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import PackageType
1212

1313
extension Package {
14-
public enum Error: ErrorType {
14+
public enum ModuleError: ErrorType {
1515
case NoModules(Package)
1616
case ModuleNotFound(String)
1717
case InvalidLayout(InvalidLayoutType)

Sources/Transmute/Package+modules.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ extension Package {
2323

2424
if srcroot != path {
2525
guard walk(path, recursively: false).filter(isValidSource).isEmpty else {
26-
throw Error.InvalidLayout(.InvalidLayout)
26+
throw ModuleError.InvalidLayout(.InvalidLayout)
2727
}
2828
}
2929

3030
let maybeModules = walk(srcroot, recursively: false).filter(shouldConsiderDirectory)
3131

3232
if maybeModules.count == 1 && maybeModules[0] != srcroot {
3333
guard walk(srcroot, recursively: false).filter(isValidSource).isEmpty else {
34-
throw Error.InvalidLayout(.InvalidLayout)
34+
throw ModuleError.InvalidLayout(.InvalidLayout)
3535
}
3636
}
3737

@@ -40,7 +40,7 @@ extension Package {
4040
do {
4141
modules = [SwiftModule(name: self.name, sources: try sourcify(srcroot))]
4242
} catch Module.Error.NoSources {
43-
throw Error.NoModules(self)
43+
throw ModuleError.NoModules(self)
4444
}
4545
} else {
4646
modules = try maybeModules.map(sourcify).map { sources in
@@ -65,7 +65,7 @@ extension Package {
6565
switch $0 {
6666
case .Target(let name):
6767
guard let module = moduleForName(name) else {
68-
throw Error.ModuleNotFound(name)
68+
throw ModuleError.ModuleNotFound(name)
6969
}
7070
return module
7171
}

Sources/Transmute/Package+sourceRoot.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extension Package {
3030
return viableRoots[0]
3131
default:
3232
// eg. there is a `Sources' AND a `src'
33-
throw Error.InvalidLayout(.MultipleSourceRoots(viableRoots))
33+
throw ModuleError.InvalidLayout(.MultipleSourceRoots(viableRoots))
3434
}
3535
}
3636
}

0 commit comments

Comments
 (0)