Skip to content

Commit 9253284

Browse files
authored
Merge pull request #33 from erwald/fix-swiftlint-violations
Fix swiftlint violations
2 parents 332f39d + e352924 commit 9253284

File tree

4 files changed

+24
-22
lines changed

4 files changed

+24
-22
lines changed

.swiftlint.yml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
disabled_rules:
2+
- large_tuple
3+
excluded:
4+
- Carthage

ReactiveObjCBridge/ObjectiveCBridging.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ private func _bridgedSignalProducer<Value>(from signal: RACSignal<Value>, file:
129129
observer.send(value: obj)
130130
}
131131

132-
let failed: (_ error: Swift.Error?) -> () = { error in
132+
let failed: (_ error: Swift.Error?) -> Void = { error in
133133
observer.send(error: AnyError(error ?? defaultNSError("Nil RACSignal error", file: file, line: line)))
134134
}
135135

@@ -259,7 +259,7 @@ extension SignalProducerProtocol where Value: OptionalProtocol, Value.Wrapped: A
259259
break
260260
}
261261
}
262-
262+
263263
return RACDisposable {
264264
selfDisposable.dispose()
265265
}
@@ -318,7 +318,7 @@ extension SignalProtocol where Value: OptionalProtocol, Value.Wrapped: AnyObject
318318
break
319319
}
320320
}
321-
321+
322322
return RACDisposable {
323323
selfDisposable?.dispose()
324324
}

ReactiveObjCBridgeTests/ObjectiveCBridgingSpec.swift

+17-17
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class ObjectiveCBridgingSpec: QuickSpec {
7777
expect((producer.single())?.value) == 2
7878
}
7979

80-
it("should forward errors") {
80+
it("should forward errors") {
8181
let error = TestError.default
8282

8383
let racSignal = RACSignal<AnyObject>.error(error)
@@ -133,30 +133,30 @@ class ObjectiveCBridgingSpec: QuickSpec {
133133
observer.send(error: expectedError)
134134
expect(error) == expectedError
135135
}
136-
136+
137137
it("should maintain userInfo on NSError") {
138138
let (signal, observer) = Signal<AnyObject, NSError>.pipe()
139139
let racSignal = signal.toRACSignal()
140-
140+
141141
var error: String?
142-
142+
143143
racSignal.subscribeError {
144144
error = $0?.localizedDescription
145145
return
146146
}
147-
147+
148148
observer.send(error: testNSError)
149149

150150
expect(error) == userInfo[key]
151151
}
152-
152+
153153
it("should bridge next events with value Optional<Any>.none to nil in Objective-C") {
154154
let (signal, observer) = Signal<Optional<AnyObject>, NSError>.pipe()
155155
let racSignal = signal.toRACSignal().replay().materialize()
156156

157157
observer.send(value: nil)
158158
observer.sendCompleted()
159-
159+
160160
let event = racSignal.first()
161161
expect(event?.value).to(beNil())
162162
}
@@ -187,20 +187,20 @@ class ObjectiveCBridgingSpec: QuickSpec {
187187
let event = racSignal.first()
188188
expect(event?.error as? NSError) == TestError.error1 as NSError
189189
}
190-
190+
191191
it("should maintain userInfo on NSError") {
192192
let producer = SignalProducer<AnyObject, NSError>(error: testNSError)
193193
let racSignal = producer.toRACSignal().materialize()
194-
194+
195195
let event = racSignal.first()
196196
let userInfoValue = event?.error?.localizedDescription
197197
expect(userInfoValue) == userInfo[key]
198198
}
199-
199+
200200
it("should bridge next events with value Optional<AnyObject>.none to nil in Objective-C") {
201201
let producer = SignalProducer<Optional<AnyObject>, NSError>(value: nil)
202202
let racSignal = producer.toRACSignal().materialize()
203-
203+
204204
let event = racSignal.first()
205205
expect(event?.value).to(beNil())
206206
}
@@ -281,7 +281,7 @@ class ObjectiveCBridgingSpec: QuickSpec {
281281

282282
var command: RACCommand<NSNumber, NSString>!
283283
var enabled = false
284-
284+
285285
beforeEach {
286286
results = []
287287
enabledProperty = MutableProperty(true)
@@ -331,7 +331,7 @@ class ObjectiveCBridgingSpec: QuickSpec {
331331
var action: Action<Optional<AnyObject>, Optional<AnyObject>, TestError>!
332332
var command: RACCommand<AnyObject, AnyObject>!
333333

334-
action = Action() { input in
334+
action = Action { input in
335335
return SignalProducer(value: input)
336336
}
337337

@@ -350,7 +350,7 @@ class ObjectiveCBridgingSpec: QuickSpec {
350350
var action: Action<NSString, Optional<AnyObject>, TestError>!
351351
var command: RACCommand<NSString, AnyObject>!
352352

353-
action = Action() { input in
353+
action = Action { _ in
354354
return SignalProducer(value: Optional<AnyObject>.none)
355355
}
356356

@@ -378,7 +378,7 @@ class ObjectiveCBridgingSpec: QuickSpec {
378378
.replay()
379379
.materialize()
380380

381-
action = Action() { input in
381+
action = Action { input in
382382
inputSubject.sendNext(input)
383383
return SignalProducer(value: "result")
384384
}
@@ -392,15 +392,15 @@ class ObjectiveCBridgingSpec: QuickSpec {
392392
expect(event.value).to(beNil())
393393
}
394394
}
395-
395+
396396
describe("RACSubscriber.sendNext") {
397397
it("should have an argument of type Optional.none represented as `nil`") {
398398
let racSignal = RACSignal<AnyObject>.createSignal { subscriber in
399399
subscriber.sendNext(Optional<AnyObject>.none)
400400
subscriber.sendCompleted()
401401
return nil
402402
}
403-
403+
404404
let event = try! racSignal.materialize().asynchronousFirstOrDefault(nil, success: nil)
405405
let value = event.value
406406
expect(value).to(beNil())

ReactiveObjCBridgeTests/TestError.swift

-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ extension AnyError: Equatable {
2525
}
2626
}
2727

28-
2928
internal extension SignalProducerProtocol {
3029
/// Halts if an error is emitted in the receiver signal.
3130
/// This is useful in tests to be able to just use `startWithNext`
@@ -47,4 +46,3 @@ internal extension SignalProtocol {
4746
}
4847
}
4948
}
50-

0 commit comments

Comments
 (0)