Skip to content

Commit

Permalink
Merge pull request #23 from glessard/outcome
Browse files Browse the repository at this point in the history
separate out the result type to a new package, Outcome
  • Loading branch information
glessard committed Sep 24, 2018
2 parents 947eda0 + ecee96d commit cf3f00f
Show file tree
Hide file tree
Showing 14 changed files with 261 additions and 382 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "Xcode/dependencies/Atomics"]
path = Xcode/dependencies/Atomics
url = https://github.com/glessard/swift-atomics.git
[submodule "Xcode/dependencies/Outcome"]
path = Xcode/dependencies/Outcome
url = https://github.com/glessard/outcome.git
3 changes: 2 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ let package = Package(
],
dependencies: [
.package(url: "https://github.com/glessard/swift-atomics.git", from: "4.1.0"),
.package(url: "https://github.com/glessard/outcome.git", from: "4.1.5")
],
targets: [
.target(name: "deferred", dependencies: ["CAtomics"]),
.target(name: "deferred", dependencies: ["CAtomics", "Outcome"]),
.testTarget(name: "deferredTests", dependencies: ["deferred"]),
],
swiftLanguageVersions: versions
Expand Down
2 changes: 1 addition & 1 deletion Source/deferred/deferred-extras.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ extension Deferred

public func enqueuing(on queue: DispatchQueue) -> Deferred
{
return Transfer(queue: queue, source: self)
return Transferred(from: self, on: queue)
}

/// Get a `Deferred` that will have the same `result` as `self` once determined,
Expand Down
Loading

0 comments on commit cf3f00f

Please sign in to comment.