Skip to content

Commit 8702152

Browse files
authored
Merge pull request swiftlang#12783 from natecook1000/nc-fixes-710-1
2 parents 759cd64 + 0b62b06 commit 8702152

13 files changed

+305
-220
lines changed

stdlib/public/core/Arrays.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ if True:
178178
/// can store any kind of elements---from integers to strings to classes.
179179
///
180180
/// Swift makes it easy to create arrays in your code using an array literal:
181-
/// simply surround a comma separated list of values with square brackets.
181+
/// simply surround a comma-separated list of values with square brackets.
182182
/// Without any other information, Swift creates an array that includes the
183183
/// specified values, automatically inferring the array's `Element` type. For
184184
/// example:

stdlib/public/core/Builtin.swift

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,13 @@ internal func != (lhs: Builtin.RawPointer, rhs: Builtin.RawPointer) -> Bool {
144144
return !(lhs == rhs)
145145
}
146146

147-
/// Returns `true` iff `t0` is identical to `t1`; i.e. if they are both
148-
/// `nil` or they both represent the same type.
147+
/// Returns a Boolean value indicating whether two types are identical.
148+
///
149+
/// - Parameters:
150+
/// - t0: A type to compare.
151+
/// - t1: Another type to compare.
152+
/// - Returns: `true` if both `t0` and `t1` are `nil` or if they represent the
153+
/// same type; otherwise, `false`.
149154
@_inlineable
150155
public func == (t0: Any.Type?, t1: Any.Type?) -> Bool {
151156
switch (t0, t1) {
@@ -156,8 +161,13 @@ public func == (t0: Any.Type?, t1: Any.Type?) -> Bool {
156161
}
157162
}
158163

159-
/// Returns `false` iff `t0` is identical to `t1`; i.e. if they are both
160-
/// `nil` or they both represent the same type.
164+
/// Returns a Boolean value indicating whether two types are not identical.
165+
///
166+
/// - Parameters:
167+
/// - t0: A type to compare.
168+
/// - t1: Another type to compare.
169+
/// - Returns: `true` if one, but not both, of `t0` and `t1` are `nil`, or if
170+
/// they represent different types; otherwise, `false`.
161171
@_inlineable
162172
public func != (t0: Any.Type?, t1: Any.Type?) -> Bool {
163173
return !(t0 == t1)

stdlib/public/core/CTypes.swift

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,17 +42,19 @@ public typealias CShort = Int16
4242
/// The C 'int' type.
4343
public typealias CInt = Int32
4444

45-
/// The C 'long' type.
4645
#if os(Windows) && arch(x86_64)
46+
/// The C 'long' type.
4747
public typealias CLong = Int32
4848
#else
49+
/// The C 'long' type.
4950
public typealias CLong = Int
5051
#endif
5152

52-
/// The C 'long long' type.
5353
#if os(Windows) && arch(x86_64)
54+
/// The C 'long long' type.
5455
public typealias CLongLong = Int
5556
#else
57+
/// The C 'long long' type.
5658
public typealias CLongLong = Int64
5759
#endif
5860

@@ -200,7 +202,7 @@ extension OpaquePointer : Equatable {
200202
}
201203
}
202204

203-
/// The corresponding Swift type to `va_list` in imported C APIs.
205+
/// A wrapper around a C `va_list` pointer.
204206
@_fixed_layout
205207
public struct CVaListPointer {
206208
@_versioned // FIXME(sil-serialize-all)

stdlib/public/core/Codable.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,8 +1166,8 @@ public protocol KeyedDecodingContainerProtocol {
11661166

11671167
// An implementation of _KeyedDecodingContainerBase and _KeyedDecodingContainerBox are given at the bottom of this file.
11681168

1169-
/// A concrete container that provides a view into an decoder's storage, making
1170-
/// the encoded properties of an decodable type accessible by keys.
1169+
/// A concrete container that provides a view into a decoder's storage, making
1170+
/// the encoded properties of a decodable type accessible by keys.
11711171
@_fixed_layout // FIXME(sil-serialize-all)
11721172
public struct KeyedDecodingContainer<K : CodingKey> : KeyedDecodingContainerProtocol {
11731173
public typealias Key = K
@@ -2307,7 +2307,8 @@ public protocol SingleValueEncodingContainer {
23072307
mutating func encode<T : Encodable>(_ value: T) throws
23082308
}
23092309

2310-
/// A `SingleValueDecodingContainer` is a container which can support the storage and direct decoding of a single non-keyed value.
2310+
/// A container that can support the storage and direct decoding of a single
2311+
/// nonkeyed value.
23112312
public protocol SingleValueDecodingContainer {
23122313
/// The path of coding keys taken to get to this point in encoding.
23132314
var codingPath: [CodingKey] { get }

stdlib/public/core/KeyPath.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,8 +1620,8 @@ func _projectKeyPathReferenceWritable<Root, Value>(
16201620
// on `Self` to prevent dynamically-typed methods from being inherited by
16211621
// statically-typed key paths.
16221622

1623-
/// This protocol is an implementation detail of key path expressions; do not
1624-
/// use it directly.
1623+
/// An implementation detail of key path expressions; do not use this protocol
1624+
/// directly.
16251625
@_show_in_interface
16261626
public protocol _AppendKeyPath {}
16271627

0 commit comments

Comments
 (0)