Skip to content

Commit d5470b7

Browse files
authored
Merge pull request groue#1233 from GetToSet/ethanwong/fix-xcode-14-warning
Fix warnings of redundant conformance constraint on Xcode 14.
2 parents b947065 + cd6960f commit d5470b7

File tree

1 file changed

+11
-60
lines changed

1 file changed

+11
-60
lines changed

GRDB/Fixit/GRDB-5.0.swift

Lines changed: 11 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -314,31 +314,22 @@ extension ValueObservation {
314314
{ preconditionFailure() }
315315

316316
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
317-
public func combine<
318-
R1: _ValueReducer,
319-
Combined>(
317+
public func combine<R1, Combined>(
320318
_ other: ValueObservation<R1>,
321319
_ transform: @escaping (Reducer.Value, R1.Value) -> Combined)
322320
-> ValueObservation<ValueReducers.Unavailable<Combined>>
323321
{ preconditionFailure() }
324322

325323
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
326-
public func combine<
327-
R1: _ValueReducer,
328-
R2: _ValueReducer,
329-
Combined>(
324+
public func combine<R1, R2, Combined>(
330325
_ observation1: ValueObservation<R1>,
331326
_ observation2: ValueObservation<R2>,
332327
_ transform: @escaping (Reducer.Value, R1.Value, R2.Value) -> Combined)
333328
-> ValueObservation<ValueReducers.Unavailable<Combined>>
334329
{ preconditionFailure() }
335330

336331
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
337-
public func combine<
338-
R1: _ValueReducer,
339-
R2: _ValueReducer,
340-
R3: _ValueReducer,
341-
Combined>(
332+
public func combine<R1, R2, R3, Combined>(
342333
_ observation1: ValueObservation<R1>,
343334
_ observation2: ValueObservation<R2>,
344335
_ observation3: ValueObservation<R3>,
@@ -347,12 +338,7 @@ extension ValueObservation {
347338
{ preconditionFailure() }
348339

349340
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
350-
public func combine<
351-
R1: _ValueReducer,
352-
R2: _ValueReducer,
353-
R3: _ValueReducer,
354-
R4: _ValueReducer,
355-
Combined>(
341+
public func combine<R1, R2, R3, R4, Combined>(
356342
_ observation1: ValueObservation<R1>,
357343
_ observation2: ValueObservation<R2>,
358344
_ observation3: ValueObservation<R3>,
@@ -374,31 +360,22 @@ extension ValueObservation {
374360

375361
extension ValueObservation where Reducer == ValueReducers.Auto {
376362
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
377-
public static func combine<
378-
R1: _ValueReducer,
379-
R2: _ValueReducer>(
363+
public static func combine<R1, R2>(
380364
_ o1: ValueObservation<R1>,
381365
_ o2: ValueObservation<R2>)
382366
-> ValueObservation<ValueReducers.Unavailable<(R1.Value, R2.Value)>>
383367
{ preconditionFailure() }
384368

385369
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
386-
public static func combine<
387-
R1: _ValueReducer,
388-
R2: _ValueReducer,
389-
R3: _ValueReducer>(
370+
public static func combine<R1, R2, R3>(
390371
_ o1: ValueObservation<R1>,
391372
_ o2: ValueObservation<R2>,
392373
_ o3: ValueObservation<R3>)
393374
-> ValueObservation<ValueReducers.Unavailable<(R1.Value, R2.Value, R3.Value)>>
394375
{ preconditionFailure() }
395376

396377
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
397-
public static func combine<
398-
R1: _ValueReducer,
399-
R2: _ValueReducer,
400-
R3: _ValueReducer,
401-
R4: _ValueReducer>(
378+
public static func combine<R1, R2, R3, R4>(
402379
_ o1: ValueObservation<R1>,
403380
_ o2: ValueObservation<R2>,
404381
_ o3: ValueObservation<R3>,
@@ -407,12 +384,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
407384
{ preconditionFailure() }
408385

409386
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
410-
public static func combine<
411-
R1: _ValueReducer,
412-
R2: _ValueReducer,
413-
R3: _ValueReducer,
414-
R4: _ValueReducer,
415-
R5: _ValueReducer>(
387+
public static func combine<R1, R2, R3, R4, R5>(
416388
_ o1: ValueObservation<R1>,
417389
_ o2: ValueObservation<R2>,
418390
_ o3: ValueObservation<R3>,
@@ -422,13 +394,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
422394
{ preconditionFailure() }
423395

424396
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
425-
public static func combine<
426-
R1: _ValueReducer,
427-
R2: _ValueReducer,
428-
R3: _ValueReducer,
429-
R4: _ValueReducer,
430-
R5: _ValueReducer,
431-
R6: _ValueReducer>(
397+
public static func combine<R1, R2, R3, R4, R5, R6>(
432398
_ o1: ValueObservation<R1>,
433399
_ o2: ValueObservation<R2>,
434400
_ o3: ValueObservation<R3>,
@@ -439,14 +405,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
439405
{ preconditionFailure() }
440406

441407
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
442-
public static func combine<
443-
R1: _ValueReducer,
444-
R2: _ValueReducer,
445-
R3: _ValueReducer,
446-
R4: _ValueReducer,
447-
R5: _ValueReducer,
448-
R6: _ValueReducer,
449-
R7: _ValueReducer>(
408+
public static func combine<R1, R2, R3, R4, R5, R6, R7>(
450409
_ o1: ValueObservation<R1>,
451410
_ o2: ValueObservation<R2>,
452411
_ o3: ValueObservation<R3>,
@@ -458,15 +417,7 @@ extension ValueObservation where Reducer == ValueReducers.Auto {
458417
{ preconditionFailure() }
459418

460419
@available(*, unavailable, message: "combine is no longer available. See the \"Migrating From GRDB 4 to GRDB 5\" guide.")
461-
public static func combine<
462-
R1: _ValueReducer,
463-
R2: _ValueReducer,
464-
R3: _ValueReducer,
465-
R4: _ValueReducer,
466-
R5: _ValueReducer,
467-
R6: _ValueReducer,
468-
R7: _ValueReducer,
469-
R8: _ValueReducer>(
420+
public static func combine<R1, R2, R3, R4, R5, R6, R7, R8>(
470421
_ o1: ValueObservation<R1>,
471422
_ o2: ValueObservation<R2>,
472423
_ o3: ValueObservation<R3>,

0 commit comments

Comments
 (0)