Skip to content

Update Result, use Result.NoError #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NachoSoto merged 2 commits into from
Jan 30, 2016
Merged

Update Result, use Result.NoError #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffff887
Update Result, use Result.NoError
ikesyo Jan 30, 2016
cc9bd28
Update Quick and Nimble
ikesyo Jan 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "antitypical/Result" ~> 1.0
github "antitypical/Result" ~> 1.0.2
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
github "Quick/Quick" ~> 0.7
github "Quick/Nimble" ~> 2.0
github "Quick/Quick" ~> 0.9
github "Quick/Nimble" ~> 3.1
6 changes: 3 additions & 3 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v2.0.0"
github "Quick/Quick" "v0.7.0"
github "antitypical/Result" "1.0.0"
github "Quick/Nimble" "v3.1.0"
github "Quick/Quick" "v0.9.0"
github "antitypical/Result" "1.0.2"
github "jspahrsummers/xcconfigs" "ec5753493605deed7358dec5f9260f503d3ed650"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 35 files
+7 −0 .gitignore
+13 −6 CONTRIBUTING.md
+2 −1 Nimble.podspec
+425 −18 Nimble.xcodeproj/project.pbxproj
+5 −5 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-OSX.xcscheme
+5 −5 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+99 −0 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+5 −4 Nimble/Adapters/AssertionRecorder.swift
+35 −0 Nimble/Adapters/NimbleEnvironment.swift
+71 −32 Nimble/DSL+Wait.swift
+29 −1 Nimble/DSL.swift
+2 −1 Nimble/Expectation.swift
+3 −3 Nimble/Info.plist
+31 −0 Nimble/Matchers/Equal.swift
+4 −4 Nimble/Matchers/HaveCount.swift
+2 −2 Nimble/Matchers/MatcherProtocols.swift
+66 −0 Nimble/Matchers/SatisfyAnyOf.swift
+3 −3 Nimble/Nimble.h
+354 −0 Nimble/Utils/Async.swift
+0 −86 Nimble/Utils/Poll.swift
+45 −12 Nimble/Wrappers/AsyncMatcherWrapper.swift
+6 −0 Nimble/objc/DSL.h
+4 −0 Nimble/objc/DSL.m
+3 −0 Nimble/objc/NMBExceptionCapture.h
+1 −1 Nimble/objc/NMBExceptionCapture.m
+81 −19 NimbleTests/AsynchronousTest.swift
+1 −1 NimbleTests/Info.plist
+29 −0 NimbleTests/Matchers/EqualTest.swift
+15 −13 NimbleTests/Matchers/HaveCountTest.swift
+40 −0 NimbleTests/Matchers/SatisfyAnyOfTest.swift
+4 −2 NimbleTests/objc/ObjCAsyncTest.m
+12 −5 NimbleTests/objc/ObjCHaveCount.m
+32 −0 NimbleTests/objc/ObjCSatisfyAnyOfTest.m
+47 −16 README.md
+14 −13 script/release
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Open in desktop
Submodule Quick updated 102 files
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Result
Open in desktop
Submodule Result updated 10 files
+1 −0 .gitignore
+10 −0 Package.swift
+70 −2 README.md
+1 −1 Result.podspec
+14 −9 Result.xcodeproj/project.pbxproj
+1 −1 Result/Info.plist
+26 −4 Result/Result.swift
+23 −0 Result/ResultType.swift
+0 −0 Tests/Info.plist
+25 −1 Tests/ResultTests.swift
3 changes: 0 additions & 3 deletions Commandant/Errors.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,6 @@ extension CommandantError: CustomStringConvertible {
}
}

/// Used to represent that a ClientError will never occur.
internal enum NoError: ErrorType {}

/// Constructs an `InvalidArgument` error that indicates a missing value for
/// the argument by the given name.
internal func missingArgumentError<ClientError>(argumentName: String) -> CommandantError<ClientError> {
Expand Down