Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
dannyhertz committed Aug 14, 2020
2 parents 3c2f18f + e6e9a7c commit b2dc668
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,6 @@ let package = Package(
dependencies: [
"ComposableCoreLocation"
]
)
),
]
)
16 changes: 8 additions & 8 deletions Sources/ComposableArchitecture/Reducer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,8 @@ public struct Reducer<State, Action, Environment> {
/// - See also: `Store.ifLet`, a UIKit helper for doing imperative work with a store on optional
/// state.
public func optional(_ file: StaticString = #file, _ line: UInt = #line) -> Reducer<
State?, Action, Environment
> {
State?, Action, Environment
> {
.init { state, action, environment in
guard state != nil else {
assertionFailure(
Expand All @@ -185,8 +185,8 @@ public struct Reducer<State, Action, Environment> {
this reducer can only be sent to a view store when state is non-"nil". In SwiftUI \
applications, use "IfLetStore".
""",
file: file,
line: line
file: file,
line: line
)
return .none
}
Expand Down Expand Up @@ -253,8 +253,8 @@ public struct Reducer<State, Action, Environment> {
To fix this make sure that actions for this reducer can only be sent to a view store when \
its state contains an element at this index. In SwiftUI applications, use `ForEachStore`.
""",
file: file,
line: line
file: file,
line: line
)
return self.reducer(
&globalState[keyPath: toLocalState][index],
Expand Down Expand Up @@ -305,8 +305,8 @@ public struct Reducer<State, Action, Environment> {
To fix this make sure that actions for this reducer can only be sent to a view store
when its state contains an element at this key.
""",
file: file,
line: line
file: file,
line: line
)
return self.reducer(
&globalState[keyPath: toLocalState][key]!,
Expand Down
2 changes: 1 addition & 1 deletion Sources/ComposableCoreLocation/Live.swift
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ extension LocationManager {
)

return Disposables.create {
dependencies[id] = nil
dependencies[id] = nil
}
}
}
Expand Down

0 comments on commit b2dc668

Please sign in to comment.