Skip to content

Commit f44686d

Browse files
[gardening] Fix trailing whitespace in *.cfg.in, *.html, *.mm and *.sil files
1 parent 7e68e02 commit f44686d

File tree

114 files changed

+1487
-1487
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+1487
-1487
lines changed

docs/archive/LangRef.html

Lines changed: 255 additions & 255 deletions
Large diffs are not rendered by default.

docs/doxygen.cfg.in

Lines changed: 501 additions & 501 deletions
Large diffs are not rendered by default.

docs/proposals/containers_value_type.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ <h2>
293293
forKey: UDefaults::StrKey(UDefaults::kShowTabView).PassNSString()];
294294

295295
[result addEntriesFromDictionary: [TBrowserContainerController defaultContainerStateForNode: inTarget]];
296-
296+
297297
return result;
298298
}
299299
</pre></blockquote>
@@ -332,7 +332,7 @@ <h2>
332332
<p>
333333
Such code is typically used as a private function and called from only
334334
one or two places. Note that here is an example that the human reader
335-
is greatly depending on really good names to make the semantics clear:
335+
is greatly depending on really good names to make the semantics clear:
336336
<code>andAddToArray</code>. In Swift such code is easily translated to
337337
something like:
338338
</p>

stdlib/public/SDK/Dispatch/Dispatch.mm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static void _dispatch_overlay_constructor() {
5151

5252
#include "swift/Runtime/Config.h"
5353

54-
SWIFT_CC(swift) DISPATCH_RUNTIME_STDLIB_INTERFACE
54+
SWIFT_CC(swift) DISPATCH_RUNTIME_STDLIB_INTERFACE
5555
extern "C" dispatch_queue_attr_t
5656
_swift_dispatch_queue_concurrent(void) {
5757
return DISPATCH_QUEUE_CONCURRENT;

stdlib/public/SDK/XCTest/XCTestCaseAdditions.mm

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,18 +108,18 @@ @implementation XCTestCase (SwiftAdditions)
108108
- (NSString *)className
109109
{
110110
NSString *className = [super className];
111-
111+
112112
char *modulePart;
113113
char *classPart;
114114
bool ok = demangleSimpleClass([className UTF8String],
115115
&modulePart, &classPart);
116116
if (ok) {
117117
className = [NSString stringWithUTF8String:classPart];
118-
118+
119119
free(modulePart);
120120
free(classPart);
121121
}
122-
122+
123123
return className;
124124
}
125125

@@ -138,12 +138,12 @@ - (NSString *)className
138138
NSDictionary *_XCTRunThrowableBlockBridge(void (^block)())
139139
{
140140
NSDictionary *result;
141-
141+
142142
@try {
143143
block();
144144
result = @{};
145145
}
146-
146+
147147
@catch (NSException *exception) {
148148
result = @{
149149
@"type": @"objc",
@@ -152,13 +152,13 @@ - (NSString *)className
152152
@"reason": exception.reason,
153153
};
154154
}
155-
155+
156156
@catch (...) {
157157
result = @{
158158
@"type": @"unknown",
159159
};
160160
}
161-
161+
162162
Block_release(block);
163163
return [result retain];
164164
}

stdlib/public/runtime/ErrorObject.mm

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -164,20 +164,20 @@ static Class getSwiftNativeNSErrorClass() {
164164
auto TheSwiftNativeNSError = getSwiftNativeNSErrorClass();
165165
assert(class_getInstanceSize(TheSwiftNativeNSError) == sizeof(SwiftErrorHeader)
166166
&& "NSError layout changed!");
167-
167+
168168
// Determine the extra allocated space necessary to carry the value.
169169
// TODO: If the error type is a simple enum with no associated values, we
170170
// could emplace it in the "code" slot of the NSError and save ourselves
171171
// some work.
172-
172+
173173
unsigned size = type->getValueWitnesses()->getSize();
174174
unsigned alignMask = type->getValueWitnesses()->getAlignmentMask();
175175

176176
size_t alignmentPadding = -sizeof(SwiftError) & alignMask;
177177
size_t totalExtraSize = sizeof(SwiftError) - sizeof(SwiftErrorHeader)
178178
+ alignmentPadding + size;
179179
size_t valueOffset = alignmentPadding + sizeof(SwiftError);
180-
180+
181181
// Allocate the instance as if it were a CFError. We won't really initialize
182182
// the CFError parts until forced to though.
183183
auto instance
@@ -194,15 +194,15 @@ static Class getSwiftNativeNSErrorClass() {
194194

195195
auto valueBytePtr = reinterpret_cast<char*>(instance) + valueOffset;
196196
auto valuePtr = reinterpret_cast<OpaqueValue*>(valueBytePtr);
197-
197+
198198
// If an initial value was given, copy or take it in.
199199
if (initialValue) {
200200
if (isTake)
201201
type->vw_initializeWithTake(valuePtr, initialValue);
202202
else
203203
type->vw_initializeWithCopy(valuePtr, initialValue);
204204
}
205-
205+
206206
// Return the SwiftError reference and a pointer to the uninitialized value
207207
// inside.
208208
return BoxPair{reinterpret_cast<HeapObject*>(instance), valuePtr};
@@ -241,13 +241,13 @@ static Class getSwiftNativeNSErrorClass() {
241241
// The witness table lives in the Foundation overlay, but it should be safe
242242
// to assume that that's been linked in if a user is using NSError in their
243243
// Swift source.
244-
244+
245245
auto TheWitnessTable = SWIFT_LAZY_CONSTANT(dlsym(RTLD_DEFAULT,
246246
"_TWPCSo7CFErrors5Error10Foundation"));
247247
assert(TheWitnessTable &&
248248
"Foundation overlay not loaded, or 'CFError : Error' conformance "
249249
"not available");
250-
250+
251251
return reinterpret_cast<const WitnessTable *>(TheWitnessTable);
252252
}
253253

@@ -342,15 +342,15 @@ static Class getSwiftNativeNSErrorClass() {
342342
if (errorObject->isPureNSError()) {
343343
// Return a pointer to the scratch buffer.
344344
auto asError = (NSError*)errorObject;
345-
345+
346346
*scratch = (void*)errorObject;
347347
out->value = (const OpaqueValue *)scratch;
348348
out->type = swift_getObjCClassMetadata((ClassMetadata*)[asError class]);
349349

350350
out->errorConformance = getNSErrorConformanceToError();
351351
return;
352352
}
353-
353+
354354
out->value = errorObject->getValue();
355355
out->type = errorObject->type;
356356
out->errorConformance = errorObject->errorConformance;
@@ -424,13 +424,13 @@ static id _swift_bridgeErrorToNSError_(SwiftError *errorObject) {
424424
if (errorObject->domain.load(std::memory_order_acquire) &&
425425
errorObject->userInfo.load(std::memory_order_acquire))
426426
return ns;
427-
427+
428428
// Otherwise, calculate the domain and code (TODO: and user info), and
429429
// initialize the NSError.
430430
auto value = SwiftError::getIndirectValue(&errorObject);
431431
auto type = errorObject->getType();
432432
auto witness = errorObject->getErrorConformance();
433-
433+
434434
NSString *domain = swift_stdlib_getErrorDomainNSString(value, type, witness);
435435
NSInteger code = swift_stdlib_getErrorCode(value, type, witness);
436436
NSDictionary *userInfo =
@@ -464,7 +464,7 @@ static id _swift_bridgeErrorToNSError_(SwiftError *errorObject) {
464464
(CFStringRef)domain,
465465
std::memory_order_acq_rel))
466466
objc_release(domain);
467-
467+
468468
return ns;
469469
}
470470

@@ -483,7 +483,7 @@ static id _swift_bridgeErrorToNSError_(SwiftError *errorObject) {
483483
const Metadata *destType,
484484
DynamicCastFlags flags) {
485485
Class NSErrorClass = getNSErrorClass();
486-
486+
487487
auto CFErrorTypeID = SWIFT_LAZY_CONSTANT(CFErrorGetTypeID());
488488
// @_silgen_name("swift_stdlib_bridgeNSErrorToError")
489489
// public func _stdlib_bridgeNSErrorToError<
@@ -503,7 +503,7 @@ bool BridgeFn(NSError *, OpaqueValue*, const Metadata *,
503503
// If the Foundation overlay isn't loaded, then NSErrors can't be bridged.
504504
if (!bridgeNSErrorToError || !TheObjectiveCBridgeableError)
505505
return false;
506-
506+
507507
// Is the input type an NSError?
508508
switch (srcType->getKind()) {
509509
case MetadataKind::Class:
@@ -541,14 +541,14 @@ bool BridgeFn(NSError *, OpaqueValue*, const Metadata *,
541541
case MetadataKind::Tuple:
542542
return false;
543543
}
544-
544+
545545
// Is the target type a bridgeable error?
546546
auto witness = swift_conformsToProtocol(destType,
547547
TheObjectiveCBridgeableError);
548-
548+
549549
if (!witness)
550550
return false;
551-
551+
552552
// If so, attempt the bridge.
553553
NSError *srcInstance = *reinterpret_cast<NSError * const*>(src);
554554
objc_retain(srcInstance);

0 commit comments

Comments
 (0)