Merge pull request #43 from Carthage/some-cleanups

Some cleanups for the codebase

Author: mdiep

Commandant/ArgumentParser.swift

@@ -125,15 +125,20 @@ public final class ArgumentParser {
 		rawArguments.removeAll()
 
 		var foundValue: String?
-		argumentLoop: for var index = 0; index < oldArguments.count; index++ {
+		var index = 0
+
+		while index < oldArguments.count {
+			defer { index += 1 }
+
 			let arg = oldArguments[index]
 
 			if arg == .Key(key) {
-				if ++index < oldArguments.count {
+				index += 1
+				if index < oldArguments.count {
 					switch oldArguments[index] {
 					case let .Value(value):
 						foundValue = value
-						continue argumentLoop
+						continue
 
 					default:
 						break
@@ -152,8 +157,8 @@ public final class ArgumentParser {
 	/// Returns the next positional argument that hasn't yet been returned, or
 	/// nil if there are no more positional arguments.
 	internal func consumePositionalArgument() -> String? {
-		for var index = 0; index < rawArguments.count; index++ {
-			switch rawArguments[index] {
+		for (index, arg) in rawArguments.enumerate() {
+			switch arg {
 			case let .Value(value):
 				rawArguments.removeAtIndex(index)
 				return value
@@ -180,7 +185,8 @@ public final class ArgumentParser {
 	internal func consumeBooleanFlag(flag: Character) -> Bool {
 		for (index, arg) in rawArguments.enumerate() {
 			switch arg {
-			case var .Flag(flags) where flags.contains(flag):
+			case let .Flag(flags) where flags.contains(flag):
+				var flags = flags
 				flags.remove(flag)
 				if flags.isEmpty {
 					rawArguments.removeAtIndex(index)

Commandant/Command.swift

@@ -138,12 +138,13 @@ extension CommandRegistry {
 	/// If a matching command could not be found or a usage error occurred,
 	/// a helpful error message will be written to `stderr`, then the process
 	/// will exit with a failure error code.
-	@noreturn public func main(var arguments arguments: [String], defaultVerb: String, errorHandler: ClientError -> ()) {
+	@noreturn public func main(arguments arguments: [String], defaultVerb: String, errorHandler: ClientError -> ()) {
 		assert(arguments.count >= 1)
 
+		var arguments = arguments
+
 		// Extract the executable name.
-		let executableName = arguments.first!
-		arguments.removeAtIndex(0)
+		let executableName = arguments.removeAtIndex(0)
 
 		let verb = arguments.first ?? defaultVerb
 		if arguments.count > 0 {
@@ -152,10 +153,10 @@ extension CommandRegistry {
 		}
 
 		switch runCommand(verb, arguments: arguments) {
-		case .Some(.Success):
+		case .Success?:
 			exit(EXIT_SUCCESS)
 
-		case let .Some(.Failure(error)):
+		case let .Failure(error)?:
 			switch error {
 			case let .UsageError(description):
 				fputs(description + "\n", stderr)
@@ -166,7 +167,7 @@ extension CommandRegistry {
 
 			exit(EXIT_FAILURE)
 
-		case .None:
+		case nil:
 			fputs("Unrecognized command: '\(verb)'. See `\(executableName) help`.\n", stderr)
 			exit(EXIT_FAILURE)
 		}