Merge remote-tracking branch 'origin/main' into rebranch

swift-ci · swift-ci · commit f5a0a1b0e3a3 · 2022-01-12T11:53:05.000-08:00
diff --git a/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift b/stdlib/private/SwiftPrivateThreadExtras/SwiftPrivateThreadExtras.swift
@@ -101,7 +101,7 @@ public func _stdlib_thread_create_block<Argument, Result>(
     return (0, ThreadHandle(bitPattern: threadID))
   }
 #elseif os(WASI)
-  // WASI environment has a only single thread
+  // WASI environment is single-threaded
   return (0, nil)
 #else
   var threadID = _make_pthread_t()

Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public func _stdlib_thread_create_block<Argument, Result>(`
`101`	`101`	`return (0, ThreadHandle(bitPattern: threadID))`
`102`	`102`	`}`
`103`	`103`	`#elseif os(WASI)`
`104`		`- // WASI environment has a only single thread`
	`104`	`+ // WASI environment is single-threaded`
`105`	`105`	`return (0, nil)`
`106`	`106`	`#else`
`107`	`107`	`var threadID = _make_pthread_t()`