Skip to content

Commit bfc4580

Browse files
cthielencthielen
authored
Update code formatting on SF-0011 with more readable indentation and generic parameters (#1305)
1 parent 0f62460 commit bfc4580

File tree

1 file changed

+68
-77
lines changed

1 file changed

+68
-77
lines changed

‎Proposals/0011-concurrency-safe-notifications.md‎

Lines changed: 68 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -209,36 +209,37 @@ For `MainActorMessage`:
209209
@available(FoundationPreview 0.5, *)
210210
extension NotificationCenter {
211211
// e.g. addObserver(of: workspace, for: .willLaunchApplication) { message in ... }
212-
public func addObserver<I: MessageIdentifier, M: MainActorMessage>(of subject: M.Subject,
213-
for identifier: I,
214-
using observer: @escaping @MainActor (M) -> Void)
215-
-> ObservationToken where I.MessageType == M,
216-
M.Subject: AnyObject
212+
public func addObserver<Identifier: MessageIdentifier, Message: MainActorMessage>(
213+
of subject: Message.Subject,
214+
for identifier: Identifier,
215+
using observer: @escaping @MainActor (Message) -> Void
216+
) -> ObservationToken where Identifier.MessageType == Message, Message.Subject: AnyObject
217217

218-
public func addObserver<I: MessageIdentifier, M: MainActorMessage>(of subject: M.Subject,
219-
for identifier: I,
220-
using observer: @escaping @MainActor (M) -> Void)
221-
-> ObservationToken where I.MessageType == M,
222-
M.Subject: Identifiable,
223-
M.Subject.ID == ObjectIdentifier
218+
public func addObserver<Identifier: MessageIdentifier, Message: MainActorMessage>(
219+
of subject: Message.Subject,
220+
for identifier: Identifier,
221+
using observer: @escaping @MainActor (Message) -> Void
222+
) -> ObservationToken where Identifier.MessageType == Message, Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
224223

225224
// e.g. addObserver(of: NSWorkspace.self, for: .willLaunchApplication) { message in ... }
226-
public func addObserver<I: MessageIdentifier, M: MainActorMessage>(of subject: M.Subject.Type,
227-
for identifier: I,
228-
using observer: @escaping @MainActor (M) -> Void)
229-
-> ObservationToken where I.MessageType == M
225+
public func addObserver<Identifier: MessageIdentifier, Message: MainActorMessage>(
226+
of subject: Message.Subject.Type,
227+
for identifier: Identifier,
228+
using observer: @escaping @MainActor (Message) -> Void
229+
) -> ObservationToken where Identifier.MessageType == Message
230230

231231
// e.g. addObserver(for: NSWorkspace.WillLaunchApplication.self) { message in ... }
232-
public func addObserver<M: MainActorMessage>(of subject: M.Subject? = nil,
233-
for messageType: M.Type,
234-
using observer: @escaping @MainActor (M) -> Void)
235-
-> ObservationToken where M.Subject: AnyObject
236-
237-
public func addObserver<M: MainActorMessage>(of subject: M.Subject? = nil,
238-
for messageType: M.Type,
239-
using observer: @escaping @MainActor (M) -> Void)
240-
-> ObservationToken where M.Subject: Identifiable,
241-
M.Subject.ID == ObjectIdentifier
232+
public func addObserver<Message: MainActorMessage>(
233+
of subject: Message.Subject? = nil,
234+
for messageType: Message.Type,
235+
using observer: @escaping @MainActor (Message) -> Void
236+
) -> ObservationToken where Message.Subject: AnyObject
237+
238+
public func addObserver<Message: MainActorMessage>(
239+
of subject: Message.Subject? = nil,
240+
for messageType: Message.Type,
241+
using observer: @escaping @MainActor (Message) -> Void
242+
) -> ObservationToken where Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
242243
}
243244
```
244245

@@ -247,34 +248,35 @@ And for `AsyncMessage`:
247248
```swift
248249
@available(FoundationPreview 0.5, *)
249250
extension NotificationCenter {
250-
public func addObserver<I: MessageIdentifier, M: AsyncMessage>(of subject: M.Subject,
251-
for identifier: I,
252-
using observer: @escaping @Sendable (M) async -> Void)
253-
-> ObservationToken where I.MessageType == M,
254-
M.Subject: AnyObject
255-
256-
public func addObserver<I: MessageIdentifier, M: AsyncMessage>(of subject: M.Subject,
257-
for identifier: I,
258-
using observer: @escaping @Sendable (M) async -> Void)
259-
-> ObservationToken where I.MessageType == M,
260-
M.Subject: Identifiable,
261-
M.Subject.ID == ObjectIdentifier
262-
263-
public func addObserver<I: MessageIdentifier, M: AsyncMessage>(of subject: M.Subject.Type,
264-
for identifier: I,
265-
using observer: @escaping @Sendable (M) async -> Void)
266-
-> ObservationToken where I.MessageType == M
251+
public func addObserver<Identifier: MessageIdentifier, Message: AsyncMessage>(
252+
of subject: Message.Subject,
253+
for identifier: Identifier,
254+
using observer: @escaping @Sendable (Message) async -> Void
255+
) -> ObservationToken where Identifier.MessageType == Message, Message.Subject: AnyObject
256+
257+
public func addObserver<Identifier: MessageIdentifier, Message: AsyncMessage>(
258+
of subject: Message.Subject,
259+
for identifier: Identifier,
260+
using observer: @escaping @Sendable (Message) async -> Void
261+
) -> ObservationToken where Identifier.MessageType == Message, Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
262+
263+
public func addObserver<Identifier: MessageIdentifier, Message: AsyncMessage>(
264+
of subject: Message.Subject.Type,
265+
for identifier: Identifier,
266+
using observer: @escaping @Sendable (Message) async -> Void
267+
) -> ObservationToken where Identifier.MessageType == Message
267268

268-
public func addObserver<M: AsyncMessage>(of subject: M.Subject? = nil,
269-
for messageType: M.Type,
270-
using observer: @escaping @Sendable (M) async -> Void)
271-
-> ObservationToken where M.Subject: AnyObject
269+
public func addObserver<Message: AsyncMessage>(
270+
of subject: Message.Subject? = nil,
271+
for messageType: Message.Type,
272+
using observer: @escaping @Sendable (Message) async -> Void
273+
) -> ObservationToken where Message.Subject: AnyObject
272274

273-
public func addObserver<M: AsyncMessage>(of subject: M.Subject? = nil,
274-
for messageType: M.Type,
275-
using observer: @escaping @Sendable (M) async -> Void)
276-
-> ObservationToken where M.Subject: Identifiable,
277-
M.Subject.ID == ObjectIdentifier
275+
public func addObserver<Message: AsyncMessage>(
276+
of subject: Message.Subject? = nil,
277+
for messageType: Message.Type,
278+
using observer: @escaping @Sendable (Message) async -> Void
279+
) -> ObservationToken where Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
278280
}
279281
```
280282

@@ -302,40 +304,31 @@ extension NotificationCenter {
302304
of subject: Message.Subject,
303305
for identifier: Identifier,
304306
bufferSize limit: Int = 10
305-
)
306-
-> some AsyncSequence<Message, Never> where Identifier.MessageType == Message,
307-
Message.Subject: AnyObject
307+
) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message, Message.Subject: AnyObject
308308

309309
public func messages<Identifier: MessageIdentifier, Message: AsyncMessage>(
310310
of subject: Message.Subject,
311311
for identifier: Identifier,
312312
bufferSize limit: Int = 10
313-
)
314-
-> some AsyncSequence<Message, Never> where Identifier.MessageType == Message,
315-
Message.Subject: Identifiable,
316-
Message.Subject.ID == ObjectIdentifier {}
313+
) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message, Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier {}
317314

318315
public func messages<Identifier: MessageIdentifier, Message: AsyncMessage>(
319316
of subject: Message.Subject.Type,
320317
for identifier: Identifier,
321318
bufferSize limit: Int = 10
322-
)
323-
-> some AsyncSequence<Message, Never> where Identifier.MessageType == Message
319+
) -> some AsyncSequence<Message, Never> where Identifier.MessageType == Message
324320

325321
public func messages<Message: AsyncMessage>(
326322
of subject: Message.Subject? = nil,
327323
for messageType: Message.Type,
328324
bufferSize limit: Int = 10
329-
)
330-
-> some AsyncSequence<Message, Never> where Message.Subject: AnyObject
325+
) -> some AsyncSequence<Message, Never> where Message.Subject: AnyObject
331326

332327
public func messages<Message: AsyncMessage>(
333328
of subject: Message.Subject? = nil,
334329
for messageType: Message.Type,
335330
bufferSize limit: Int = 10
336-
)
337-
-> some AsyncSequence<Message, Never> where Message.Subject: Identifiable,
338-
Message.Subject.ID == ObjectIdentifier
331+
) -> some AsyncSequence<Message, Never> where Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
339332
}
340333
```
341334

@@ -366,27 +359,25 @@ extension NotificationCenter {
366359
// MainActorMessage post()
367360

368361
@MainActor
369-
public func post<M: MainActorMessage>(_ message: M, subject: M.Subject)
370-
where M.Subject: AnyObject
362+
public func post<Message: MainActorMessage>(_ message: Message, subject: Message.Subject)
363+
where Message.Subject: AnyObject
371364

372365
@MainActor
373-
public func post<M: MainActorMessage>(_ message: M, subject: M.Subject)
374-
where M.Subject: Identifiable,
375-
M.Subject.ID == ObjectIdentifier
366+
public func post<Message: MainActorMessage>(_ message: Message, subject: Message.Subject)
367+
where Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
376368

377369
@MainActor
378-
public func post<M: MainActorMessage>(_ message: M, subject: M.Subject.Type = M.Subject.self)
370+
public func post<Message: MainActorMessage>(_ message: Message, subject: Message.Subject.Type = Message.Subject.self)
379371

380372
// AsyncMessage post()
381373

382-
public func post<M: AsyncMessage>(_ message: M, subject: M.Subject)
383-
where M.Subject: AnyObject
374+
public func post<Message: AsyncMessage>(_ message: Message, subject: Message.Subject)
375+
where Message.Subject: AnyObject
384376

385-
public func post<M: AsyncMessage>(_ message: M, subject: M.Subject)
386-
where M.Subject: Identifiable,
387-
M.Subject.ID == ObjectIdentifier
377+
public func post<Message: AsyncMessage>(_ message: Message, subject: Message.Subject)
378+
where Message.Subject: Identifiable, Message.Subject.ID == ObjectIdentifier
388379

389-
public func post<M: AsyncMessage>(_ message: M, subject: M.Subject.Type = M.Subject.self)
380+
public func post<Message: AsyncMessage>(_ message: Message, subject: Message.Subject.Type = Message.Subject.self)
390381
}
391382
```
392383

0 commit comments

Comments
 (0)