Rename ObjType -> ObjectType

10 files changed, 39 insertions, 39 deletions

diff --git a/loose.go b/loose.go
index d79b2f48..7303e7be 100644
--- a/loose.go
+++ b/loose.go
@@ -29,7 +29,7 @@ func (repo *Repository) looseRead(id Hash) (Object, error) {
 	return parseObjectBody(ty, id, body, repo)
 }
 
-func (repo *Repository) looseReadTyped(id Hash) (ObjType, []byte, error) {
+func (repo *Repository) looseReadTyped(id Hash) (ObjectType, []byte, error) {
 	path, err := repo.loosePath(id)
 	if err != nil {
 		return ObjInvalid, nil, err
@@ -78,7 +78,7 @@ func (repo *Repository) looseReadTyped(id Hash) (ObjType, []byte, error) {
 	return ty, out, nil
 }
 
-func (repo *Repository) looseTypeSize(id Hash) (ObjType, int64, error) {
+func (repo *Repository) looseTypeSize(id Hash) (ObjectType, int64, error) {
 	path, err := repo.loosePath(id)
 	if err != nil {
 		return ObjInvalid, 0, err
@@ -128,7 +128,7 @@ func (repo *Repository) looseTypeSize(id Hash) (ObjType, int64, error) {
 	return parseLooseHeader(header)
 }
 
-func parseLooseHeader(header []byte) (ObjType, int64, error) {
+func parseLooseHeader(header []byte) (ObjectType, int64, error) {
 	space := bytes.IndexByte(header, ' ')
 	if space < 0 {
 		return ObjInvalid, 0, ErrInvalidObject
@@ -151,7 +151,7 @@ func parseLooseHeader(header []byte) (ObjType, int64, error) {
 	return ty, size, nil
 }
 
-func objTypeFromName(name string) (ObjType, error) {
+func objTypeFromName(name string) (ObjectType, error) {
 	switch name {
 	case objNameBlob:
 		return ObjBlob, nil
diff --git a/obj.go b/obj.go
index 983c7557..ab37c570 100644
--- a/obj.go
+++ b/obj.go
@@ -7,18 +7,18 @@ import (
 	"strconv"
 )
 
-// ObjType mirrors Git's object type tags.
-type ObjType uint8
+// ObjectType mirrors Git's object type tags.
+type ObjectType uint8
 
 const (
-	ObjInvalid  ObjType = 0
-	ObjCommit   ObjType = 1
-	ObjTree     ObjType = 2
-	ObjBlob     ObjType = 3
-	ObjTag      ObjType = 4
-	ObjFuture   ObjType = 5
-	ObjOfsDelta ObjType = 6
-	ObjRefDelta ObjType = 7
+	ObjInvalid  ObjectType = 0
+	ObjCommit   ObjectType = 1
+	ObjTree     ObjectType = 2
+	ObjBlob     ObjectType = 3
+	ObjTag      ObjectType = 4
+	ObjFuture   ObjectType = 5
+	ObjOfsDelta ObjectType = 6
+	ObjRefDelta ObjectType = 7
 )
 
 const (
@@ -30,10 +30,10 @@ const (
 
 // Object describes any Git object variant.
 type Object interface {
-	ObjType() ObjType
+	ObjectType() ObjectType
 }
 
-func headerForType(ty ObjType, body []byte) ([]byte, error) {
+func headerForType(ty ObjectType, body []byte) ([]byte, error) {
 	var tyStr string
 	switch ty {
 	case ObjBlob:
@@ -59,7 +59,7 @@ func headerForType(ty ObjType, body []byte) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func parseObjectBody(ty ObjType, id Hash, body []byte, repo *Repository) (Object, error) {
+func parseObjectBody(ty ObjectType, id Hash, body []byte, repo *Repository) (Object, error) {
 	switch ty {
 	case ObjBlob:
 		return parseBlob(id, body)
@@ -93,7 +93,7 @@ func (repo *Repository) ReadObject(id Hash) (Object, error) {
 }
 
 // ReadObjectTypeSize reports the object type and size without inflating the body.
-func (repo *Repository) ReadObjectTypeSize(id Hash) (ObjType, int64, error) {
+func (repo *Repository) ReadObjectTypeSize(id Hash) (ObjectType, int64, error) {
 	ty, size, err := repo.looseTypeSize(id)
 	if err == nil {
 		return ty, size, nil
diff --git a/obj_blob.go b/obj_blob.go
index 556a21fc..45d412ff 100644
--- a/obj_blob.go
+++ b/obj_blob.go
@@ -7,8 +7,8 @@ type Blob struct {
 	Data []byte
 }
 
-// ObjType allows Blob to satisfy the Object interface.
-func (*Blob) ObjType() ObjType {
+// ObjectType allows Blob to satisfy the Object interface.
+func (*Blob) ObjectType() ObjectType {
 	return ObjBlob
 }
 
diff --git a/obj_commit.go b/obj_commit.go
index 4a5d2567..8abb363f 100644
--- a/obj_commit.go
+++ b/obj_commit.go
@@ -17,8 +17,8 @@ type Commit struct {
 	ExtraHeaders []ExtraHeader
 }
 
-// ObjType allows Commit to satisfy the Object interface.
-func (*Commit) ObjType() ObjType {
+// ObjectType allows Commit to satisfy the Object interface.
+func (*Commit) ObjectType() ObjectType {
 	return ObjCommit
 }
 
diff --git a/obj_tag.go b/obj_tag.go
index 9230274d..440eb15e 100644
--- a/obj_tag.go
+++ b/obj_tag.go
@@ -10,14 +10,14 @@ import (
 type Tag struct {
 	Hash       Hash
 	Target     Hash
-	TargetType ObjType
+	TargetType ObjectType
 	Name       []byte
 	Tagger     *Ident
 	Message    []byte
 }
 
-// ObjType allows Tag to satisfy the Object interface.
-func (*Tag) ObjType() ObjType {
+// ObjectType allows Tag to satisfy the Object interface.
+func (*Tag) ObjectType() ObjectType {
 	return ObjTag
 }
 
diff --git a/obj_tree.go b/obj_tree.go
index 0a7e6a97..66fdb8bd 100644
--- a/obj_tree.go
+++ b/obj_tree.go
@@ -20,8 +20,8 @@ type TreeEntry struct {
 	ID   Hash
 }
 
-// ObjType allows Tree to satisfy the Object interface.
-func (*Tree) ObjType() ObjType {
+// ObjectType allows Tree to satisfy the Object interface.
+func (*Tree) ObjectType() ObjectType {
 	return ObjTree
 }
 
diff --git a/pack_pack.go b/pack_pack.go
index 4a75b1ad..54a48521 100644
--- a/pack_pack.go
+++ b/pack_pack.go
@@ -78,7 +78,7 @@ func (repo *Repository) packReadAt(loc packlocation, want Hash) (Object, error)
 	return obj, err
 }
 
-func (repo *Repository) packBodyResolveAtLocation(loc packlocation) (ObjType, borrowedBody, error) {
+func (repo *Repository) packBodyResolveAtLocation(loc packlocation) (ObjectType, borrowedBody, error) {
 	pf, err := repo.packFile(loc.PackPath)
 	if err != nil {
 		return ObjInvalid, borrowedBody{}, err
@@ -86,7 +86,7 @@ func (repo *Repository) packBodyResolveAtLocation(loc packlocation) (ObjType, bo
 	return repo.packBodyResolveWithin(pf, loc.Offset)
 }
 
-func (repo *Repository) packTypeSizeAtLocation(loc packlocation, seen map[packKey]struct{}) (ObjType, int64, error) {
+func (repo *Repository) packTypeSizeAtLocation(loc packlocation, seen map[packKey]struct{}) (ObjectType, int64, error) {
 	pf, err := repo.packFile(loc.PackPath)
 	if err != nil {
 		return ObjInvalid, 0, err
@@ -94,7 +94,7 @@ func (repo *Repository) packTypeSizeAtLocation(loc packlocation, seen map[packKe
 	return repo.packTypeSizeWithin(pf, loc.Offset, seen)
 }
 
-func (repo *Repository) packTypeSizeByID(id Hash, seen map[packKey]struct{}) (ObjType, int64, error) {
+func (repo *Repository) packTypeSizeByID(id Hash, seen map[packKey]struct{}) (ObjectType, int64, error) {
 	loc, err := repo.packIndexFind(id)
 	if err == nil {
 		return repo.packTypeSizeAtLocation(loc, seen)
@@ -105,13 +105,13 @@ func (repo *Repository) packTypeSizeByID(id Hash, seen map[packKey]struct{}) (Ob
 	return repo.looseTypeSize(id)
 }
 
-func packHeaderRead(r io.Reader) (ObjType, int, error) {
+func packHeaderRead(r io.Reader) (ObjectType, int, error) {
 	var b [1]byte
 	_, err := io.ReadFull(r, b[:])
 	if err != nil {
 		return ObjInvalid, 0, err
 	}
-	ty := ObjType((b[0] >> 4) & 0x07)
+	ty := ObjectType((b[0] >> 4) & 0x07)
 	size := int(b[0] & 0x0f)
 	shift := 4
 	for (b[0] & 0x80) != 0 {
@@ -172,7 +172,7 @@ func packSectionInflate(r io.Reader, sizeHint int) (borrowedBody, error) {
 	}
 }
 
-func (repo *Repository) packDeltaResolveOfs(pf *packFile, deltaOffset uint64, r io.Reader) (ObjType, borrowedBody, error) {
+func (repo *Repository) packDeltaResolveOfs(pf *packFile, deltaOffset uint64, r io.Reader) (ObjectType, borrowedBody, error) {
 	dist, err := packDeltaReadOfsDistance(r)
 	if err != nil {
 		return ObjInvalid, borrowedBody{}, err
@@ -220,7 +220,7 @@ func packDeltaReadOfsDistance(r io.Reader) (uint64, error) {
 	return dist, nil
 }
 
-func (repo *Repository) packBodyResolveByID(id Hash) (ObjType, borrowedBody, error) {
+func (repo *Repository) packBodyResolveByID(id Hash) (ObjectType, borrowedBody, error) {
 	loc, err := repo.packIndexFind(id)
 	if err == nil {
 		return repo.packBodyResolveAtLocation(loc)
@@ -240,7 +240,7 @@ type packKey struct {
 	ofs  uint64
 }
 
-func (repo *Repository) packTypeSizeWithin(pf *packFile, ofs uint64, seen map[packKey]struct{}) (ObjType, int64, error) {
+func (repo *Repository) packTypeSizeWithin(pf *packFile, ofs uint64, seen map[packKey]struct{}) (ObjectType, int64, error) {
 	if pf == nil {
 		return ObjInvalid, 0, ErrInvalidObject
 	}
@@ -300,7 +300,7 @@ func (repo *Repository) packTypeSizeWithin(pf *packFile, ofs uint64, seen map[pa
 	}
 }
 
-func (repo *Repository) packBodyResolveWithin(pf *packFile, ofs uint64) (ObjType, borrowedBody, error) {
+func (repo *Repository) packBodyResolveWithin(pf *packFile, ofs uint64) (ObjectType, borrowedBody, error) {
 	r, err := pf.cursor(ofs)
 	if err != nil {
 		return ObjInvalid, borrowedBody{}, err
diff --git a/pack_test.go b/pack_test.go
index 6ca7e115..e9aac281 100644
--- a/pack_test.go
+++ b/pack_test.go
@@ -41,7 +41,7 @@ func TestPackSectionInflate(t *testing.T) {
 	body.Release()
 }
 
-func encodePackHeader(ty ObjType, size int) []byte {
+func encodePackHeader(ty ObjectType, size int) []byte {
 	first := byte((ty & 0x7) << 4)
 	first |= byte(size & 0x0f)
 	size >>= 4
diff --git a/repo.go b/repo.go
index cfe7320e..9b767f01 100644
--- a/repo.go
+++ b/repo.go
@@ -166,7 +166,7 @@ func (repo *Repository) verifyRawObject(buf []byte, want Hash) bool {
 }
 
 // verifyTypedObject verifies a typed object against its expected hash.
-func (repo *Repository) verifyTypedObject(ty ObjType, body []byte, want Hash) bool {
+func (repo *Repository) verifyTypedObject(ty ObjectType, body []byte, want Hash) bool {
 	if want.size != repo.HashSize {
 		return false
 	}
diff --git a/repo_test.go b/repo_test.go
index 43cc9919..b0d98db0 100644
--- a/repo_test.go
+++ b/repo_test.go
@@ -319,7 +319,7 @@ const (
 )
 
 type testPackObject struct {
-	finalType ObjType
+	finalType ObjectType
 	body      []byte
 	encoding  packObjectEncoding
 	baseIndex int