Remove drop in replacement for standard library errors package

Author: sethwklein

README

@@ -1,12 +1,12 @@
 What?
 
-Package errors provides things for working with single and multiple errors and
-errors from deferred function calls.
+Package errutil provides things for working with multiple errors and errors
+from deferred function calls.
 
 Import
 
-import "sethwklein.net/go/errors"
+import "sethwklein.net/go/errutil"
 
 Documentation
 
-http://godoc.org/sethwklein.net/go/errors
+http://godoc.org/sethwklein.net/go/errutil

benchmark_test.go

@@ -1,8 +1,8 @@
-package errors_test
+package errutil_test
 
 import (
 	"fmt"
-	"sethwklein.net/go/errors"
+	"sethwklein.net/go/errutil"
 	"testing"
 )
 
@@ -17,13 +17,13 @@ func BenchmarkBase(b *testing.B) {
 func BenchmarkAppend(b *testing.B) {
 	var list error
 	for i := 0; i < b.N; i++ {
-		list = errors.Append(list, fmt.Errorf("number %v", i))
+		list = errutil.Append(list, fmt.Errorf("number %v", i))
 	}
 }
 
 func BenchmarkNil(b *testing.B) {
 	var list error
 	for i := 0; i < b.N; i++ {
-		list = errors.Append(list, nil)
+		list = errutil.Append(list, nil)
 	}
 }

benchmark_walkn_test.go

@@ -1,8 +1,8 @@
-package errors_test
+package errutil_test
 
 import (
 	"fmt"
-	"sethwklein.net/go/errors"
+	"sethwklein.net/go/errutil"
 	"testing"
 )
 
@@ -12,7 +12,7 @@ const attentionSpan = 30
 func BenchmarkWalkPanic(b *testing.B) {
 	var list error
 	for i := 1; i <= listLen; i++ {
-		list = errors.Append(list, fmt.Errorf("number %v", i))
+		list = errutil.Append(list, fmt.Errorf("number %v", i))
 	}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
@@ -24,7 +24,7 @@ func BenchmarkWalkPanic(b *testing.B) {
 			}()
 			n := attentionSpan
 			i := 0
-			errors.Walk(list, func(e error) {
+			errutil.Walk(list, func(e error) {
 				_ = e
 				i++
 				if i >= n {
@@ -38,13 +38,13 @@ func BenchmarkWalkPanic(b *testing.B) {
 func BenchmarkWalkIgnore(b *testing.B) {
 	var list error
 	for i := 1; i <= listLen; i++ {
-		list = errors.Append(list, fmt.Errorf("number %v", i))
+		list = errutil.Append(list, fmt.Errorf("number %v", i))
 	}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
 		n := attentionSpan
 		i := 0
-		errors.Walk(list, func(e error) {
+		errutil.Walk(list, func(e error) {
 			i++
 			if i > n {
 				return
@@ -57,11 +57,11 @@ func BenchmarkWalkIgnore(b *testing.B) {
 func BenchmarkWalkN(b *testing.B) {
 	var list error
 	for i := 1; i <= listLen; i++ {
-		list = errors.Append(list, fmt.Errorf("number %v", i))
+		list = errutil.Append(list, fmt.Errorf("number %v", i))
 	}
 	b.ResetTimer()
 	for i := 0; i < b.N; i++ {
-		errors.WalkN(list, attentionSpan, func(e error) {
+		errutil.WalkN(list, attentionSpan, func(e error) {
 			_ = e
 		})
 	}

call_test.go

@@ -1,14 +1,15 @@
-package errors
+package errutil
 
 import (
+	"errors"
 	"io"
 	"reflect"
 	"testing"
 )
 
 func TestCall(t *testing.T) {
 	var err error
-	e := New("appended error")
+	e := errors.New("appended error")
 	AppendCall(&err, func() error {
 		return e
 	})
@@ -55,24 +56,24 @@ func TestCallNilNil(t *testing.T) {
 }
 
 func TestCallErrNil(t *testing.T) {
-	w := New("write error")
+	w := errors.New("write error")
 	err := doCall(w, nil)
 	if err != w {
 		t.Errorf("%v != %v", err, w)
 	}
 }
 
 func TestCallNilErr(t *testing.T) {
-	c := New("close error")
+	c := errors.New("close error")
 	err := doCall(nil, c)
 	if err != c {
 		t.Errorf("%v != %v", err, c)
 	}
 }
 
 func TestCallErrErr(t *testing.T) {
-	w := New("write error")
-	c := New("close error")
+	w := errors.New("write error")
+	c := errors.New("close error")
 	err := doCall(w, c)
 	correct := &errorList{[]error{w, c}}
 	if !reflect.DeepEqual(err, correct) {

doc.go

@@ -1,6 +1,3 @@
-// Package errors provides things for working with single and multiple errors.
-//
-// It is a drop in replacement for the standard errors package
-// but with extra features for handling multiple errors
-// and correctly handling errors from deferred calls.
-package errors
+// Package errutil provides things for working with multiple errors and
+// correctly handling errors from deferred calls.
+package errutil

errorlist.go

@@ -1,4 +1,4 @@
-package errors
+package errutil
 
 import "strings"
 
@@ -34,6 +34,7 @@ type Firster interface {
 	First() error
 }
 
+// First implements ErrorList.First.
 func (list *errorList) First() error {
 	// They're not supposed to do this, but let's be permissive.
 	if len(list.a) < 1 {

errorlists_test.go

@@ -1,30 +1,31 @@
 // Copyright 2011 The Go Authors.  All rights reserved.
+// Copyright 2013 Seth W. Klein.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-// Portions copyright 2013 Seth W. Klein.
 
-package errors_test
+package errutil_test
 
 import (
-	"sethwklein.net/go/errors"
+	"errors"
+	"sethwklein.net/go/errutil"
 	"testing"
 )
 
 func TestNewEqualList(t *testing.T) {
 	// Different allocations should not be equal.
-	if errors.Append(errors.New("ab"), errors.New("cd")) == errors.Append(errors.New("ab"), errors.New("cd")) {
+	if errutil.Append(errors.New("ab"), errors.New("cd")) == errutil.Append(errors.New("ab"), errors.New("cd")) {
 		t.Errorf(`Append(New("ab"), New("cd")) == Append(New("ab"), New("cd"))`)
 	}
 
 	// Same allocation should be equal to itself (not crash).
-	err := errors.Append(errors.New("jk"), errors.New("lm"))
+	err := errutil.Append(errors.New("jk"), errors.New("lm"))
 	if err != err {
 		t.Errorf(`err != err`)
 	}
 }
 
 func TestErrorMethodList(t *testing.T) {
-	err := errors.Append(errors.New("ab"), errors.New("cd"))
+	err := errutil.Append(errors.New("ab"), errors.New("cd"))
 	if err.Error() != "ab"+"\n"+"cd" {
 		t.Errorf(`Append(New("ab"), New("cd")) = %q, want %q`,
 			err.Error(), "ab\ncd")

errors.go

@@ -1,19 +1,19 @@
-package errors_test
+package errutil_test
 
 import (
 	"fmt"
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"sethwklein.net/go/errors"
+	"sethwklein.net/go/errutil"
 )
 
 func ReinventTheIOUtil(filename string) (buf []byte, err error) {
 	f, err := os.Open(filename)
 	if err != nil {
 		return nil, err
 	}
-	defer errors.AppendCall(&err, f.Close)
+	defer errutil.AppendCall(&err, f.Close)
 
 	buf, err = ioutil.ReadAll(f)
 	if err != nil {
@@ -26,7 +26,7 @@ func ExampleAppendCall() {
 	buf, err := ReinventTheIOUtil("errorlist.go")
 	if err != nil {
 		command := filepath.Base(os.Args[0])
-		errors.Walk(err, func(e error) {
+		errutil.Walk(err, func(e error) {
 			fmt.Fprintf(os.Stderr, "%s, Error: %s\n", command, e)
 		})
 	}