Skip to content

fix: Use err instead of error as a variable name for errors (#746) #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lhchavez merged 1 commit into from
Feb 15, 2021
Merged

fix: Use err instead of error as a variable name for errors (#746) #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ func NewOid(s string) (*Oid, error) {

o := new(Oid)

slice, error := hex.DecodeString(s)
if error != nil {
return nil, error
slice, err := hex.DecodeString(s)
if err != nil {
return nil, err
}

if len(slice) != 20 {
Expand Down
38 changes: 19 additions & 19 deletions odb_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,31 +61,31 @@ func TestOdbStream(t *testing.T) {

_, _ = seedTestRepo(t, repo)

odb, error := repo.Odb()
checkFatal(t, error)
odb, err := repo.Odb()
checkFatal(t, err)

str := "hello, world!"

writeStream, error := odb.NewWriteStream(int64(len(str)), ObjectBlob)
checkFatal(t, error)
n, error := io.WriteString(writeStream, str)
checkFatal(t, error)
writeStream, err := odb.NewWriteStream(int64(len(str)), ObjectBlob)
checkFatal(t, err)
n, err := io.WriteString(writeStream, str)
checkFatal(t, err)
if n != len(str) {
t.Fatalf("Bad write length %v != %v", n, len(str))
}

error = writeStream.Close()
checkFatal(t, error)
err = writeStream.Close()
checkFatal(t, err)

expectedId, error := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
checkFatal(t, error)
expectedId, err := NewOid("30f51a3fba5274d53522d0f19748456974647b4f")
checkFatal(t, err)
if writeStream.Id.Cmp(expectedId) != 0 {
t.Fatal("Wrong data written")
}

readStream, error := odb.NewReadStream(&writeStream.Id)
checkFatal(t, error)
data, error := ioutil.ReadAll(readStream)
readStream, err := odb.NewReadStream(&writeStream.Id)
checkFatal(t, err)
data, err := ioutil.ReadAll(readStream)
if str != string(data) {
t.Fatalf("Wrong data read %v != %v", str, string(data))
}
Expand All @@ -98,8 +98,8 @@ func TestOdbHash(t *testing.T) {

_, _ = seedTestRepo(t, repo)

odb, error := repo.Odb()
checkFatal(t, error)
odb, err := repo.Odb()
checkFatal(t, err)

str := `tree 115fcae49287c82eb55bb275cbbd4556fbed72b7
parent 66e1c476199ebcd3e304659992233132c5a52c6c
Expand All @@ -109,11 +109,11 @@ committer John Doe <[email protected]> 1390682018 +0000
Initial commit.`

for _, data := range [][]byte{[]byte(str), doublePointerBytes()} {
oid, error := odb.Hash(data, ObjectCommit)
checkFatal(t, error)
oid, err := odb.Hash(data, ObjectCommit)
checkFatal(t, err)

coid, error := odb.Write(data, ObjectCommit)
checkFatal(t, error)
coid, err := odb.Write(data, ObjectCommit)
checkFatal(t, err)

if oid.Cmp(coid) != 0 {
t.Fatal("Hash and write Oids are different")
Expand Down