averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76257 from AreaZR/e

Browse Source 
Use instancetype for the benchmark and SwiftNativeNSObject
This commit is contained in:
Alastair Houghton
2024-11-14 14:18:00 +00:00
committed by GitHub
parent abfa450e3e 7f2787e249
commit f2e48bd293
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/utils/ObjectiveCTests/ObjectiveCTests.h
View File

@@ -23,7 +23,7 @@ NS_ASSUME_NONNULL_BEGIN
NSArray<NSString *> *bridgedStrings; NSArray<NSString *> *bridgedStrings;
} }
- (id)init; - (instancetype)init NS_DESIGNATED_INITIALIZER;
- (void)setUpStringTests:(NSArray<NSString *> *)bridgedStrings; - (void)setUpStringTests:(NSArray<NSString *> *)bridgedStrings;
- (void)testFromString:(NSString *) str; - (void)testFromString:(NSString *) str;
- (NSString *)testToString; - (NSString *)testToString;

2
benchmark/utils/ObjectiveCTests/ObjectiveCTests.m
View File

@@ -102,7 +102,7 @@
@implementation BridgeTester @implementation BridgeTester
- (id)init { - (instancetype)init {
self = [super init]; self = [super init];
if (!self) if (!self)
return self; return self;

4
stdlib/public/stubs/SwiftNativeNSObject.mm
View File

@@ -39,7 +39,7 @@ SWIFT_RUNTIME_STDLIB_API
@implementation SwiftNativeNSObject @implementation SwiftNativeNSObject
+ (id)allocWithZone: (NSZone *)zone { + (instancetype)allocWithZone: (NSZone *)zone {
// Allocate the object with swift_allocObject(). // Allocate the object with swift_allocObject().
// Note that this doesn't work if called on SwiftNativeNSObject itself, // Note that this doesn't work if called on SwiftNativeNSObject itself,
// which is not a Swift class. // which is not a Swift class.
@@ -50,7 +50,7 @@ SWIFT_RUNTIME_STDLIB_API
return reinterpret_cast<id>(result); return reinterpret_cast<id>(result);
} }
- (id)initWithCoder: (NSCoder *)coder { - (instancetype)initWithCoder: (NSCoder *)coder {
return [super init]; return [super init];
} }

2
stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb
View File

@@ -62,7 +62,7 @@ SWIFT_RUNTIME_STDLIB_API
@implementation __SwiftNativeNS${Class}Base @implementation __SwiftNativeNS${Class}Base
- (id)initWithCoder: (NSCoder *)coder { - (instancetype)initWithCoder: (NSCoder *)coder {
return [super init]; return [super init];
} }