instancetype return from constructors

Ben Chatelain · Ben Chatelain · commit db8ba7c87c58 · 2015-03-23T19:05:39.000-06:00
diff --git a/ObjectiveGit/GTBlob.m b/ObjectiveGit/GTBlob.m
@@ -46,19 +46,19 @@ - (NSString *)description {
 
 #pragma mark API
 
-+ (id)blobWithString:(NSString *)string inRepository:(GTRepository *)repository error:(NSError **)error {
++ (instancetype)blobWithString:(NSString *)string inRepository:(GTRepository *)repository error:(NSError **)error {
 	return [[self alloc] initWithString:string inRepository:repository error:error];
 }
 
-+ (id)blobWithData:(NSData *)data inRepository:(GTRepository *)repository error:(NSError **)error {
++ (instancetype)blobWithData:(NSData *)data inRepository:(GTRepository *)repository error:(NSError **)error {
 	return [[self alloc] initWithData:data inRepository:repository error:error];
 }
 
-+ (id)blobWithFile:(NSURL *)file inRepository:(GTRepository *)repository error:(NSError **)error {
++ (instancetype)blobWithFile:(NSURL *)file inRepository:(GTRepository *)repository error:(NSError **)error {
 	return [[self alloc] initWithFile:file inRepository:repository error:error];
 }
 
-- (id)initWithOid:(const git_oid *)oid inRepository:(GTRepository *)repository error:(NSError **)error {
+- (instancetype)initWithOid:(const git_oid *)oid inRepository:(GTRepository *)repository error:(NSError **)error {
 	NSParameterAssert(oid != NULL);
 	NSParameterAssert(repository != nil);
 
@@ -74,12 +74,12 @@ - (id)initWithOid:(const git_oid *)oid inRepository:(GTRepository *)repository e
     return [self initWithObj:obj inRepository:repository];
 }
 
-- (id)initWithString:(NSString *)string inRepository:(GTRepository *)repository error:(NSError **)error {
+- (instancetype)initWithString:(NSString *)string inRepository:(GTRepository *)repository error:(NSError **)error {
 	NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
     return [self initWithData:data inRepository:repository error:error];
 }
 
-- (id)initWithData:(NSData *)data inRepository:(GTRepository *)repository error:(NSError **)error {
+- (instancetype)initWithData:(NSData *)data inRepository:(GTRepository *)repository error:(NSError **)error {
 	NSParameterAssert(data != nil);
 	NSParameterAssert(repository != nil);
 
@@ -95,7 +95,7 @@ - (id)initWithData:(NSData *)data inRepository:(GTRepository *)repository error:
     return [self initWithOid:&oid inRepository:repository error:error];
 }
 
-- (id)initWithFile:(NSURL *)file inRepository:(GTRepository *)repository error:(NSError **)error {
+- (instancetype)initWithFile:(NSURL *)file inRepository:(GTRepository *)repository error:(NSError **)error {
 	NSParameterAssert(file != nil);
 	NSParameterAssert(repository != nil);
 
diff --git a/ObjectiveGit/GTEnumerator.m b/ObjectiveGit/GTEnumerator.m
@@ -48,7 +48,7 @@ @implementation GTEnumerator
 
 #pragma mark Lifecycle
 
-- (id)initWithRepository:(GTRepository *)repo error:(NSError **)error {
+- (instancetype)initWithRepository:(GTRepository *)repo error:(NSError **)error {
 	NSParameterAssert(repo != nil);
 
 	self = [super init];
diff --git a/ObjectiveGit/GTOID.h b/ObjectiveGit/GTOID.h
@@ -27,14 +27,14 @@ NS_ASSUME_NONNULL_BEGIN
 /// git_oid - The underlying git_oid. Cannot be NULL.
 ///
 /// Returns the initialized receiver.
-- (nullable id)initWithGitOid:(const git_oid *)git_oid NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithGitOid:(const git_oid *)git_oid NS_DESIGNATED_INITIALIZER;
 
 /// Initializes the receiver by converting the given SHA to an OID.
 ///
 /// SHA - The to convert to an OID. Cannot be nil.
 ///
 /// Returns the initialized receiver.
-- (nullable id)initWithSHA:(NSString *)SHA;
+- (nullable instancetype)initWithSHA:(NSString *)SHA;
 
 /// Initializes the receiver by converting the given SHA to an OID
 /// optionally returning a NSError instance on failure.
@@ -43,14 +43,14 @@ NS_ASSUME_NONNULL_BEGIN
 /// error - Will be filled with an error object in if the SHA cannot be parsed
 ///
 /// Returns the initialized receiver or nil if an error occured.
-- (nullable id)initWithSHA:(NSString *)SHA error:(NSError **)error;
+- (nullable instancetype)initWithSHA:(NSString *)SHA error:(NSError **)error;
 
 /// Initializes the receiver by converting the given SHA C string to an OID.
 ///
 /// string - The C string to convert. Cannot be NULL.
 ///
 /// Returns the initialized receiver.
-- (nullable id)initWithSHACString:(const char *)string;
+- (nullable instancetype)initWithSHACString:(const char *)string;
 
 /// Initializes the receiver by converting the given SHA C string to an OID
 /// optionally returning a NSError instance on failure.
@@ -59,7 +59,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// error  - Will be filled with an error object in if the SHA cannot be parsed
 ///
 /// Returns the initialized receiver.
-- (nullable id)initWithSHACString:(const char *)string error:(NSError **)error NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithSHACString:(const char *)string error:(NSError **)error NS_DESIGNATED_INITIALIZER;
 
 /// Creates a new instance with the given git_oid using initWithGitOid:
 + (nullable instancetype)oidWithGitOid:(const git_oid *)git_oid;
diff --git a/ObjectiveGit/GTOID.m b/ObjectiveGit/GTOID.m
@@ -39,7 +39,7 @@ - (NSString *)SHA {
 
 #pragma mark Lifecycle
 
-- (id)initWithGitOid:(const git_oid *)oid {
+- (instancetype)initWithGitOid:(const git_oid *)oid {
 	NSParameterAssert(oid != NULL);
 
 	self = [super init];
@@ -50,16 +50,16 @@ - (id)initWithGitOid:(const git_oid *)oid {
 	return self;
 }
 
-- (id)initWithSHA:(NSString *)SHA error:(NSError **)error {
+- (instancetype)initWithSHA:(NSString *)SHA error:(NSError **)error {
 	NSParameterAssert(SHA != nil);
 	return [self initWithSHACString:SHA.UTF8String error:error];
 }
 
-- (id)initWithSHA:(NSString *)SHA {
+- (instancetype)initWithSHA:(NSString *)SHA {
 	return [self initWithSHA:SHA error:NULL];
 }
 
-- (id)initWithSHACString:(const char *)string error:(NSError **)error {
+- (instancetype)initWithSHACString:(const char *)string error:(NSError **)error {
 	NSParameterAssert(string != NULL);
 	
 	self = [super init];
@@ -76,7 +76,7 @@ - (id)initWithSHACString:(const char *)string error:(NSError **)error {
 	return self;
 }
 
-- (id)initWithSHACString:(const char *)string {
+- (instancetype)initWithSHACString:(const char *)string {
 	return [self initWithSHACString:string error:NULL];
 }
 
diff --git a/ObjectiveGit/GTObjectDatabase.h b/ObjectiveGit/GTObjectDatabase.h
@@ -40,7 +40,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// error - The error if one occurred.
 ///
 /// Returns the initialized object.
-- (nullable id)initWithRepository:(GTRepository *)repo error:(NSError **)error NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithRepository:(GTRepository *)repo error:(NSError **)error NS_DESIGNATED_INITIALIZER;
 
 /// The underlying `git_odb` object.
 - (git_odb *)git_odb __attribute__((objc_returns_inner_pointer));
diff --git a/ObjectiveGit/GTObjectDatabase.m b/ObjectiveGit/GTObjectDatabase.m
@@ -56,7 +56,7 @@ - (void)dealloc {
 
 #pragma mark API
 
-- (id)initWithRepository:(GTRepository *)repo error:(NSError **)error {
+- (instancetype)initWithRepository:(GTRepository *)repo error:(NSError **)error {
 	NSParameterAssert(repo != nil);
 
 	self = [super init];
diff --git a/ObjectiveGit/GTOdbObject.h b/ObjectiveGit/GTOdbObject.h
@@ -21,7 +21,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// repository - The repository in which the object resides. Cannot be nil.
 ///
 /// Returns the initialized object.
-- (nullable id)initWithOdbObj:(git_odb_object *)object repository:(GTRepository *)repository NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithOdbObj:(git_odb_object *)object repository:(GTRepository *)repository NS_DESIGNATED_INITIALIZER;
 
 /// The underlying `git_odb_object`.
 - (git_odb_object *)git_odb_object __attribute__((objc_returns_inner_pointer));
diff --git a/ObjectiveGit/GTOdbObject.m b/ObjectiveGit/GTOdbObject.m
@@ -31,7 +31,7 @@ - (NSString *)description {
 
 #pragma mark API
 
-- (id)initWithOdbObj:(git_odb_object *)object repository:(GTRepository *)repository {
+- (instancetype)initWithOdbObj:(git_odb_object *)object repository:(GTRepository *)repository {
 	NSParameterAssert(object != NULL);
 	NSParameterAssert(repository != nil);
 
diff --git a/ObjectiveGit/GTReference.h b/ObjectiveGit/GTReference.h
@@ -61,19 +61,19 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly, strong) GTReflog *reflog;
 
 /// Convenience initializers
-+ (id)referenceByLookingUpReferencedNamed:(NSString *)refName inRepository:(GTRepository *)theRepo error:(NSError **)error;
-- (id)initByLookingUpReferenceNamed:(NSString *)refName inRepository:(GTRepository *)theRepo error:(NSError **)error;
++ (instancetype)referenceByLookingUpReferencedNamed:(NSString *)refName inRepository:(GTRepository *)theRepo error:(NSError **)error;
+- (instancetype)initByLookingUpReferenceNamed:(NSString *)refName inRepository:(GTRepository *)theRepo error:(NSError **)error;
 
-+ (id)referenceByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error;
-- (id)initByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error;
++ (instancetype)referenceByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error;
+- (instancetype)initByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error;
 
 /// Designated initializer.
 ///
 /// ref        - The reference to wrap. Must not be nil.
 /// repository - The repository containing the reference. Must not be nil.
 ///
 /// Returns the initialized receiver.
-- (nullable id)initWithGitReference:(git_reference *)ref repository:(GTRepository *)repository NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithGitReference:(git_reference *)ref repository:(GTRepository *)repository NS_DESIGNATED_INITIALIZER;
 
 /// The underlying `git_reference` object.
 - (git_reference *)git_reference __attribute__((objc_returns_inner_pointer));
diff --git a/ObjectiveGit/GTReference.m b/ObjectiveGit/GTReference.m
@@ -69,15 +69,15 @@ - (BOOL)isRemote {
 	return git_reference_is_remote(self.git_reference) != 0;
 }
 
-+ (id)referenceByLookingUpReferencedNamed:(NSString *)refName inRepository:(GTRepository *)theRepo error:(NSError **)error {
++ (instancetype)referenceByLookingUpReferencedNamed:(NSString *)refName inRepository:(GTRepository *)theRepo error:(NSError **)error {
 	return [[self alloc] initByLookingUpReferenceNamed:refName inRepository:theRepo error:error];
 }
 
-+ (id)referenceByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error {
++ (instancetype)referenceByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error {
 	return [[self alloc] initByResolvingSymbolicReference:symbolicRef error:error];
 }
 
-- (id)initByLookingUpReferenceNamed:(NSString *)refName inRepository:(GTRepository *)repo error:(NSError **)error {
+- (instancetype)initByLookingUpReferenceNamed:(NSString *)refName inRepository:(GTRepository *)repo error:(NSError **)error {
 	NSParameterAssert(refName != nil);
 	NSParameterAssert(repo != nil);
 
@@ -91,7 +91,7 @@ - (id)initByLookingUpReferenceNamed:(NSString *)refName inRepository:(GTReposito
 	return [self initWithGitReference:ref repository:repo];
 }
 
-- (id)initByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error {
+- (instancetype)initByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError **)error {
 	NSParameterAssert(symbolicRef != nil);
 
 	git_reference *ref = NULL;
@@ -104,7 +104,7 @@ - (id)initByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError
 	return [self initWithGitReference:ref repository:symbolicRef.repository];
 }
 
-- (id)initWithGitReference:(git_reference *)ref repository:(GTRepository *)repo {
+- (instancetype)initWithGitReference:(git_reference *)ref repository:(GTRepository *)repo {
 	NSParameterAssert(ref != NULL);
 	NSParameterAssert(repo != nil);
 
diff --git a/ObjectiveGit/GTSignature.h b/ObjectiveGit/GTSignature.h
@@ -52,7 +52,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// git_signature - The signature to wrap. This must not be NULL.
 ///
 /// Returns an initialized GTSignature, or nil if an error occurs.
-- (nullable id)initWithGitSignature:(const git_signature *)git_signature;
+- (nullable instancetype)initWithGitSignature:(const git_signature *)git_signature;
 
 /// Initializes the receiver with the given information.
 ///
@@ -62,7 +62,7 @@ NS_ASSUME_NONNULL_BEGIN
 ///         zone. This may be nil.
 ///
 /// Returns an initialized GTSignature, or nil if an error occurs.
-- (nullable id)initWithName:(NSString *)name email:(NSString *)email time:(nullable NSDate *)time;
+- (nullable instancetype)initWithName:(NSString *)name email:(NSString *)email time:(nullable NSDate *)time;
 
 /// The underlying `git_signature` object.
 - (const git_signature *)git_signature __attribute__((objc_returns_inner_pointer));
diff --git a/ObjectiveGit/GTSignature.m b/ObjectiveGit/GTSignature.m
@@ -48,7 +48,7 @@ - (void)dealloc {
 	}
 }
 
-- (id)initWithGitSignature:(const git_signature *)git_signature {
+- (instancetype)initWithGitSignature:(const git_signature *)git_signature {
 	NSParameterAssert(git_signature != NULL);
 
 	self = [super init];
@@ -60,7 +60,7 @@ - (id)initWithGitSignature:(const git_signature *)git_signature {
 	return self;
 }
 
-- (id)initWithName:(NSString *)name email:(NSString *)email time:(NSDate *)time {
+- (instancetype)initWithName:(NSString *)name email:(NSString *)email time:(NSDate *)time {
 	NSParameterAssert(name != nil);
 	NSParameterAssert(email != nil);
 
diff --git a/ObjectiveGit/GTTreeBuilder.h b/ObjectiveGit/GTTreeBuilder.h
@@ -61,7 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
 /// error      - The error if one occurred.
 ///
 /// Returns the initialized object, or nil if an error occurred.
-- (nullable id)initWithTree:(nullable GTTree *)treeOrNil repository:(GTRepository *)repository error:(NSError **)error NS_DESIGNATED_INITIALIZER;
+- (nullable instancetype)initWithTree:(nullable GTTree *)treeOrNil repository:(GTRepository *)repository error:(NSError **)error NS_DESIGNATED_INITIALIZER;
 
 /// The underlying `git_treebuilder` object.
 - (git_treebuilder *)git_treebuilder __attribute__((objc_returns_inner_pointer));
diff --git a/ObjectiveGit/GTTreeBuilder.m b/ObjectiveGit/GTTreeBuilder.m
@@ -62,7 +62,7 @@ - (NSUInteger)entryCount {
 
 #pragma mark Lifecycle
 
-- (id)initWithTree:(GTTree *)treeOrNil repository:(GTRepository *)repository error:(NSError **)error {
+- (instancetype)initWithTree:(GTTree *)treeOrNil repository:(GTRepository *)repository error:(NSError **)error {
 	NSParameterAssert(repository != nil);
 
 	self = [super init];

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ - (NSString *)SHA {`
`39`	`39`
`40`	`40`	`#pragma mark Lifecycle`
`41`	`41`
`42`		`-- (id)initWithGitOid:(const git_oid *)oid {`
	`42`	`+- (instancetype)initWithGitOid:(const git_oid *)oid {`
`43`	`43`	`NSParameterAssert(oid != NULL);`
`44`	`44`
`45`	`45`	`self = [super init];`
`@@ -50,16 +50,16 @@ - (id)initWithGitOid:(const git_oid *)oid {`
`50`	`50`	`return self;`
`51`	`51`	`}`
`52`	`52`
`53`		`-- (id)initWithSHA:(NSString )SHA error:(NSError *)error {`
	`53`	`+- (instancetype)initWithSHA:(NSString )SHA error:(NSError *)error {`
`54`	`54`	`NSParameterAssert(SHA != nil);`
`55`	`55`	`return [self initWithSHACString:SHA.UTF8String error:error];`
`56`	`56`	`}`
`57`	`57`
`58`		`-- (id)initWithSHA:(NSString *)SHA {`
	`58`	`+- (instancetype)initWithSHA:(NSString *)SHA {`
`59`	`59`	`return [self initWithSHA:SHA error:NULL];`
`60`	`60`	`}`
`61`	`61`
`62`		`-- (id)initWithSHACString:(const char )string error:(NSError *)error {`
	`62`	`+- (instancetype)initWithSHACString:(const char )string error:(NSError *)error {`
`63`	`63`	`NSParameterAssert(string != NULL);`
`64`	`64`
`65`	`65`	`self = [super init];`
`@@ -76,7 +76,7 @@ - (id)initWithSHACString:(const char )string error:(NSError *)error {`
`76`	`76`	`return self;`
`77`	`77`	`}`
`78`	`78`
`79`		`-- (id)initWithSHACString:(const char *)string {`
	`79`	`+- (instancetype)initWithSHACString:(const char *)string {`
`80`	`80`	`return [self initWithSHACString:string error:NULL];`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -69,15 +69,15 @@ - (BOOL)isRemote {`
`69`	`69`	`return git_reference_is_remote(self.git_reference) != 0;`
`70`	`70`	`}`
`71`	`71`
`72`		`-+ (id)referenceByLookingUpReferencedNamed:(NSString )refName inRepository:(GTRepository )theRepo error:(NSError **)error {`
	`72`	`++ (instancetype)referenceByLookingUpReferencedNamed:(NSString )refName inRepository:(GTRepository )theRepo error:(NSError **)error {`
`73`	`73`	`return [[self alloc] initByLookingUpReferenceNamed:refName inRepository:theRepo error:error];`
`74`	`74`	`}`
`75`	`75`
`76`		`-+ (id)referenceByResolvingSymbolicReference:(GTReference )symbolicRef error:(NSError *)error {`
	`76`	`++ (instancetype)referenceByResolvingSymbolicReference:(GTReference )symbolicRef error:(NSError *)error {`
`77`	`77`	`return [[self alloc] initByResolvingSymbolicReference:symbolicRef error:error];`
`78`	`78`	`}`
`79`	`79`
`80`		`-- (id)initByLookingUpReferenceNamed:(NSString )refName inRepository:(GTRepository )repo error:(NSError **)error {`
	`80`	`+- (instancetype)initByLookingUpReferenceNamed:(NSString )refName inRepository:(GTRepository )repo error:(NSError **)error {`
`81`	`81`	`NSParameterAssert(refName != nil);`
`82`	`82`	`NSParameterAssert(repo != nil);`
`83`	`83`
`@@ -91,7 +91,7 @@ - (id)initByLookingUpReferenceNamed:(NSString *)refName inRepository:(GTReposito`
`91`	`91`	`return [self initWithGitReference:ref repository:repo];`
`92`	`92`	`}`
`93`	`93`
`94`		`-- (id)initByResolvingSymbolicReference:(GTReference )symbolicRef error:(NSError *)error {`
	`94`	`+- (instancetype)initByResolvingSymbolicReference:(GTReference )symbolicRef error:(NSError *)error {`
`95`	`95`	`NSParameterAssert(symbolicRef != nil);`
`96`	`96`
`97`	`97`	`git_reference *ref = NULL;`
`@@ -104,7 +104,7 @@ - (id)initByResolvingSymbolicReference:(GTReference *)symbolicRef error:(NSError`
`104`	`104`	`return [self initWithGitReference:ref repository:symbolicRef.repository];`
`105`	`105`	`}`
`106`	`106`
`107`		`-- (id)initWithGitReference:(git_reference )ref repository:(GTRepository )repo {`
	`107`	`+- (instancetype)initWithGitReference:(git_reference )ref repository:(GTRepository )repo {`
`108`	`108`	`NSParameterAssert(ref != NULL);`
`109`	`109`	`NSParameterAssert(repo != nil);`
`110`	`110`