renamed "ScanErrorComplainer" to "ScanError"

scan_error_complainer.go

@@ -1,31 +1,27 @@
 package pathmatch
 
-
 import (
 	"fmt"
 )
 
-
+type ScanError interface {
-type ScanErrorComplainer interface {
 	InternalErrorComplainer
-	ScanErrorComplainer()
+	ScanError()
 	WrappedError() error
 }
 
-
+// internalScanError is the only underlying implementation that fits the
-// internalScanErrorComplainer is the only underlying implementation that fits the
+// ScanError interface, in this library.
-// ScanErrorComplainer interface, in this library.
+type internalScanError struct {
-type internalScanErrorComplainer struct {
 	wrappedError error
 	argumentIndex int
 	argumentType  string
 }
 
-
+// newScanError creates a new internalScanError (struct) and
-// newScanErrorComplainer creates a new internalScanErrorComplainer (struct) and
+// returns it as a ScanError (interface).
-// returns it as a ScanErrorComplainer (interface).
+func newScanError(wrappedError error, argumentIndex int, argumentType string) ScanError {
-func newScanErrorComplainer(wrappedError error, argumentIndex int, argumentType string) ScanErrorComplainer {
+	err := internalScanError{
-	err := internalScanErrorComplainer{
 		wrappedError:wrappedError,
 		argumentIndex:argumentIndex,
 		argumentType:argumentType,
@@ -34,28 +30,25 @@ func newScanErrorComplainer(wrappedError error, argumentIndex int, argumentType
 	return &err
 }
 
-
 // Error method is necessary to satisfy the 'error' interface (and the
-// ScanErrorComplainer interface).
+// ScanError interface).
-func (err *internalScanErrorComplainer) Error() string {
+func (err *internalScanError) Error() string {
 	s := fmt.Sprintf("Internal Error: Received scan error for argument #%d (%s): %q", err.argumentIndex, err.argumentType, err.wrappedError.Error())
 	return s
 }
 
-
 // InternalErrorComplainer method is necessary to satisfy the 'InternalErrorComplainer' interface.
 // It exists to make this error type detectable in a Go type-switch.
-func (err *internalScanErrorComplainer) InternalErrorComplainer() {
+func (err *internalScanError) InternalErrorComplainer() {
 	// Nothing here.
 }
 
-
+// ScanError method is necessary to satisfy the 'ScanError' interface.
-// ScanErrorComplainer method is necessary to satisfy the 'ScanErrorComplainer' interface.
 // It exists to make this error type detectable in a Go type-switch.
-func (err *internalScanErrorComplainer) ScanErrorComplainer() {
+func (err *internalScanError) ScanError() {
 	// Nothing here.
 }
 
-func (err *internalScanErrorComplainer) WrappedError() error {
+func (err *internalScanError) WrappedError() error {
 	return err.wrappedError
 }

set.go

@@ -25,7 +25,7 @@ func set(value string, argsIndex int, args ...interface{}) error {
 	switch a := arg.(type) {
 	case sql.Scanner:
 		if err := a.Scan(value); nil != err {
-			return newScanErrorComplainer(err, argsIndex, fmt.Sprintf("%T", arg))
+			return newScanError(err, argsIndex, fmt.Sprintf("%T", arg))
 		}
 	case *string:
 		*a = value