Merge pull request #30 from mrackwitz/swift-2.0

Update for Xcode 7 Beta 5

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "6f356f2db6de77883cab0e86a1fa5ebb20b6679f"
-github "Quick/Quick" "a4ef16170097a2e4828a71961f1e2d9ed7b012cf"
+github "Quick/Nimble" "decf8c6be4139cbbadbb15c6505628ec168662f4"
+github "Quick/Quick" "4f7480ff9560e3791096e1a58ce09b6c0a8c926c"
 github "antitypical/Result" "932ac1aabf6d881ead74c4e6911d1271e95d2859"
 github "jspahrsummers/xcconfigs" "0.8.1"

Commandant/ArgumentParser.swift

@@ -61,15 +61,15 @@ public final class ArgumentParser {
 	/// Initializes the generator from a simple list of command-line arguments.
 	public init(_ arguments: [String]) {
 		// The first instance of `--` terminates the option list.
-		let params = split(arguments, maxSplit: 1, allowEmptySlices: true) { $0 == "--" }
+		let params = arguments.split(2, allowEmptySlices: true) { $0 == "--" }
 
 		// Parse out the keyed and flag options.
 		let options = params.first!
 		rawArguments.extend(options.map { arg in
 			if arg.hasPrefix("-") {
 				// Do we have `--{key}` or `-{flags}`.
-				let opt = dropFirst(arg.characters)
-				return String(opt).hasPrefix("-") ? .Key(String(dropFirst(opt))) : .Flag(Set(opt))
+				let opt = arg.characters.dropFirst()
+				return String(opt).hasPrefix("-") ? .Key(String(opt.dropFirst())) : .Flag(Set(opt))
 			} else {
 				return .Value(arg)
 			}