Remove explicit unwrap of optional when looking for framework source #526
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
/cc @barksten — any chance you’d be able to give this a test? |
| @@ -24,11 +24,11 @@ public struct CopyFrameworksCommand: CommandType { | |||
| |> flatMap(.Concat) { frameworkPath -> SignalProducer<(), CarthageError> in | |||
| let frameworkName = frameworkPath.lastPathComponent | |||
|
|
|||
| let source = NSURL(fileURLWithPath: frameworkPath, isDirectory: true)! | |||
| let source = Result(NSURL(fileURLWithPath: frameworkPath, isDirectory: true), failWith: CarthageError.InvalidArgument(description: "Could not find framework \"\(frameworkName)\" at path \(frameworkPath). Ensure that the given path is approriately entered. Ensure that your \"Input Files\" have been entered correctly.")) | |||
There was a problem hiding this comment.
I would combine the "Ensure that" sentences. ("…entered and that your…").
Also, there's a typo in appropriately.
|
This looks good, but unfortunately it conflicts with If you wouldn't mind updating it, I'd love to merge it! Sorry for the delay! |
eliperkins
force-pushed
the
feature/remove-explicit-unwrap
branch
from
c7c942f
to
130bade
Compare
| let target = frameworksFolder().map { $0.URLByAppendingPathComponent(frameworkName, isDirectory: true) } | ||
|
|
||
| return SignalProducer(result: target &&& validArchitectures()) | ||
| |> flatMap(.Merge) { (target, validArchitectures) -> SignalProducer<(), CarthageError> in | ||
| return combineLatest(SignalProducer(result: source), SignalProducer(result: target), SignalProducer(result: validArchitectures())) |
There was a problem hiding this comment.
After checking out antitypical/Result#47 and #547, I swapped this back to a combineLatest to handle the next value coming along. Using &&& created a tuple within a tuple instead of a tuple with three values.
|
🐎 |
|
Looks great—thanks! ✨ |
mdiep
added a commit
that referenced
this pull request
Jul 7, 2015
Remove explicit unwrap of optional when looking for framework source
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
(Hopefully) Fixes #404