Now formatting with gofmt

asc/error.go

@@ -1,3 +1,3 @@
 package asc
 
-const greaterThanErr = "the higher value was less than the lesser value!"
+const greaterThanErr = "the higher value was less than the lesser value!"

asc/numeric.go

@@ -46,4 +46,4 @@ func Uint(i, j interface{}) bool {
 
 func Int(i, j interface{}) bool {
 	return i.(int) < j.(int)
-}
+}

asc/numeric_test.go

@@ -72,4 +72,4 @@ func TestInt(t *testing.T) {
 	if Int(int(1), 0) {
 		t.Fatal("asc.TestInt failed: %v", greaterThanErr)
 	}
-}
+}

asc/time.go

@@ -4,4 +4,4 @@ import "time"
 
 func Time(i, j interface{}) bool {
 	return i.(time.Time).Before(j.(time.Time))
-}
+}

asc/time_test.go

@@ -12,4 +12,4 @@ func TestTime(t *testing.T) {
 	if Time(laterDate, earlerDate) {
 		t.Fatal("asc.TestTime failed: laterDate was before earlierDate")
 	}
-}
+}

bounds.go

@@ -22,7 +22,7 @@ func (sm *SortedMap) setBoundIdx(boundVal interface{}) int {
 
 	// If the bound value is greater than or equal to the value from the map,
 	// select the next index value.
-	if idx < smLen - 1 {
+	if idx < smLen-1 {
 		if sm.lessFn(valFromIdx, boundVal) {
 			idx++
 		}
@@ -60,4 +60,4 @@ func (sm *SortedMap) boundsIdxSearch(lowerBound, upperBound interface{}) []int {
 		lowerBoundIdx,
 		upperBoundIdx,
 	}
-}
+}

delete.go

@@ -12,7 +12,7 @@ func (sm *SortedMap) delete(key interface{}) bool {
 
 		if i == smLen {
 			i--
-		} else if i < smLen - 1 {
+		} else if i < smLen-1 {
 			i++
 		}
 		for sm.sorted[i] != key {
@@ -32,7 +32,7 @@ func (sm *SortedMap) boundedDelete(lowerBound, upperBound interface{}) bool {
 	if iterBounds == nil {
 		return false
 	}
-	for i := iterBounds[0]; i <= iterBounds[1] - i; i++ {
+	for i := iterBounds[0]; i <= iterBounds[1]-i; i++ {
 		delete(sm.idx, sm.sorted[i])
 		sm.sorted = deleteInterface(sm.sorted, i)
 	}
@@ -58,4 +58,4 @@ func (sm *SortedMap) BatchDelete(keys []interface{}) []bool {
 // BoundedDelete returns true if the operation was successful, or false otherwise.
 func (sm *SortedMap) BoundedDelete(lowerBound, upperBound interface{}) bool {
 	return sm.boundedDelete(lowerBound, upperBound)
-}
+}

delete_bench_test.go

@@ -74,4 +74,4 @@ func BenchmarkBatchDelete1000of1000Records(b *testing.B) {
 
 func BenchmarkBatchDelete10000of10000Records(b *testing.B) {
 	batchDeleteNofNRecords(b, 10000)
-}
+}

delete_test.go

@@ -47,7 +47,7 @@ func TestBatchDelete(t *testing.T) {
 
 func TestBoundedDelete(t *testing.T) {
 	const (
-		nilBoundValsErr = "accepted nil bound value"
+		nilBoundValsErr  = "accepted nil bound value"
 		generalBoundsErr = "general bounds error"
 	)
 
@@ -93,4 +93,4 @@ func TestBoundedDelete(t *testing.T) {
 	if err := verifyRecords(sm.IterCh(), false); err != nil {
 		t.Fatal(err)
 	}
-}
+}

desc/error.go

@@ -1,3 +1,3 @@
 package desc
 
-const greaterThanErr = "the lesser value was greater than the higher value!"
+const greaterThanErr = "the lesser value was greater than the higher value!"

desc/numeric.go

@@ -46,4 +46,4 @@ func Uint(i, j interface{}) bool {
 
 func Int(i, j interface{}) bool {
 	return i.(int) > j.(int)
-}
+}

desc/numeric_test.go

@@ -72,4 +72,4 @@ func TestInt(t *testing.T) {
 	if Int(int(0), 0) {
 		t.Fatal("desc.TestInt failed: %v", greaterThanErr)
 	}
-}
+}

desc/time.go

@@ -4,4 +4,4 @@ import "time"
 
 func Time(i, j interface{}) bool {
 	return i.(time.Time).After(j.(time.Time))
-}
+}

desc/time_test.go

@@ -12,4 +12,4 @@ func TestTime(t *testing.T) {
 	if Time(earlerDate, laterDate) {
 		t.Fatal("desc.TestTime failed: earlierDate was after laterDate")
 	}
-}
+}

get.go

@@ -16,4 +16,4 @@ func (sm *SortedMap) BatchGet(keys []interface{}) ([]interface{}, []bool) {
 	}
 
 	return vals, results
-}
+}

get_bench_test.go

@@ -70,4 +70,4 @@ func BenchmarkBatchGet1000of1000Records(b *testing.B) {
 
 func BenchmarkBatchGet10000of10000Records(b *testing.B) {
 	batchGetNofNRecords(b, 10000)
-}
+}

get_test.go

@@ -31,4 +31,4 @@ func TestBatchGet(t *testing.T) {
 	if err := verifyRecords(sm.IterCh(), false); err != nil {
 		t.Fatal(err)
 	}
-}
+}

has.go

@@ -13,4 +13,4 @@ func (sm *SortedMap) BatchHas(keys []interface{}) []bool {
 		_, results[i] = sm.idx[key]
 	}
 	return results
-}
+}

has_bench_test.go

@@ -70,4 +70,4 @@ func BenchmarkBatchHas1000of1000Records(b *testing.B) {
 
 func BenchmarkBatchHas10000of10000Records(b *testing.B) {
 	batchHasNofNRecords(b, 10000)
-}
+}

has_test.go

@@ -30,4 +30,4 @@ func TestBatchHas(t *testing.T) {
 	if err := verifyRecords(sm.IterCh(), false); err != nil {
 		t.Fatal(err)
 	}
-}
+}

insert.go

@@ -47,7 +47,7 @@ func (sm *SortedMap) batchInsertMapStringKeys(m map[string]interface{}) error {
 
 // BatchInsertMap adds all map keys and values to the collection.
 // If a key already exists, the value will not be inserted and an error will be returned.
-// Use BatchReplaceMap for the alternative functionality.	
+// Use BatchReplaceMap for the alternative functionality.
 func (sm *SortedMap) BatchInsertMap(v interface{}) error {
 	const unsupportedTypeErr = "Unsupported type."
 
@@ -61,4 +61,4 @@ func (sm *SortedMap) BatchInsertMap(v interface{}) error {
 	default:
 		return fmt.Errorf("%s", unsupportedTypeErr)
 	}
-}
+}

insert_bench_test.go

@@ -54,4 +54,4 @@ func BenchmarkBatchInsert1000Records(b *testing.B) {
 
 func BenchmarkBatchInsert10000Records(b *testing.B) {
 	batchInsertRecords(b, 10000)
-}
+}

insert_test.go

@@ -133,8 +133,8 @@ func TestBatchInsertMapWithExistingStringKeys(t *testing.T) {
 	}
 }
 
-func TestBatchInsertMapWithNilType(t *testing.T) { 
+func TestBatchInsertMapWithNilType(t *testing.T) {
 	if err := New(0, asc.Time).BatchInsertMap(nil); err == nil {
 		t.Fatal("a nil type was allowed where a supported map type is required.")
 	}
-}
+}

insertsort.go

@@ -6,4 +6,4 @@ func (sm *SortedMap) insertSort(key, val interface{}) []interface{} {
 	return insertInterface(sm.sorted, key, sort.Search(len(sm.sorted), func(i int) bool {
 		return sm.lessFn(val, sm.idx[sm.sorted[i]])
 	}))
-}
+}

iter.go

@@ -7,10 +7,10 @@ import "time"
 // channel send goroutines to time-out.
 // BufSize is set to 1 if its field is set to a lower value.
 // LowerBound and UpperBound default to regular iteration when left unset.
-type IterChParams struct{
-	Reversed bool
+type IterChParams struct {
+	Reversed    bool
 	SendTimeout time.Duration
-	BufSize int
+	BufSize     int
 	LowerBound,
 	UpperBound interface{}
 }
@@ -119,7 +119,7 @@ func (sm *SortedMap) IterCh() <-chan Record {
 // This method defaults to the expected behavior of blocking until a channel send completes, with no timeout.
 func (sm *SortedMap) BoundedIterCh(reversed bool, lowerBound, upperBound interface{}) (<-chan Record, bool) {
 	return sm.iterCh(IterChParams{
-		Reversed: reversed,
+		Reversed:   reversed,
 		LowerBound: lowerBound,
 		UpperBound: upperBound,
 	})
@@ -143,4 +143,4 @@ func (sm *SortedMap) IterFunc(reversed bool, f IterCallbackFunc) {
 // Sort order is reversed if the reversed argument is set to true.
 func (sm *SortedMap) BoundedIterFunc(reversed bool, lowerBound, upperBound interface{}, f IterCallbackFunc) bool {
 	return sm.iterFunc(reversed, lowerBound, upperBound, f)
-}
+}

iter_test.go

@@ -6,14 +6,14 @@ import (
 )
 
 const (
-	nilBoundValsErr = "accepted nil bound values"
+	nilBoundValsErr  = "accepted nil bound values"
 	generalBoundsErr = "between bounds error"
-	nilValErr = "nil value!"
-	nonNilValErr = "non-nil value"
-	runawayIterErr = "runaway iterator!"
+	nilValErr        = "nil value!"
+	nonNilValErr     = "non-nil value"
+	runawayIterErr   = "runaway iterator!"
 )
 
-var maxTime = time.Unix(1<<63 - 62135596801, 999999999)
+var maxTime = time.Unix(1<<63-62135596801, 999999999)
 
 func TestIterCh(t *testing.T) {
 	if _, _, err := newSortedMapFromRandRecords(1000); err != nil {
@@ -33,7 +33,7 @@ func TestIterChTimeout(t *testing.T) {
 	if ch, ok := sm.CustomIterCh(params); ok {
 		for i := 0; i < 5; i++ {
 			time.Sleep(sleepDur)
-			rec := <- ch
+			rec := <-ch
 			if i > 1 && rec.Key != nil {
 				t.Fatalf("TestIterChTimeout failed: %v: %v", nonNilValErr, rec.Key)
 			}
@@ -48,7 +48,7 @@ func TestIterChTimeout(t *testing.T) {
 	if ch, ok := sm.CustomIterCh(params); ok {
 		for i := 0; i < 5; i++ {
 			time.Sleep(sleepDur)
-			rec := <- ch
+			rec := <-ch
 			if i > 1 && rec.Key != nil {
 				t.Fatalf("TestIterChTimeout failed: %v: %v", nonNilValErr, rec.Key)
 			}
@@ -58,13 +58,13 @@ func TestIterChTimeout(t *testing.T) {
 	}
 
 	params = IterChParams{
-		Reversed: true,
+		Reversed:    true,
 		SendTimeout: timeout,
 	}
 	if ch, ok := sm.CustomIterCh(params); ok {
 		for i := 0; i < 5; i++ {
 			time.Sleep(sleepDur)
-			rec := <- ch
+			rec := <-ch
 			if i > 1 && rec.Key != nil {
 				t.Fatalf("TestIterChTimeout failed: %v: %v", nonNilValErr, rec.Key)
 			}
@@ -79,7 +79,7 @@ func TestIterChTimeout(t *testing.T) {
 	if ch, ok := sm.CustomIterCh(params); ok {
 		for i := 0; i < 5; i++ {
 			time.Sleep(sleepDur)
-			rec := <- ch
+			rec := <-ch
 			if i > 1 && rec.Key != nil {
 				t.Fatalf("TestIterChTimeout failed: %v: %v", nonNilValErr, rec.Key)
 			}
@@ -154,7 +154,7 @@ func TestBoundedIterCh(t *testing.T) {
 
 func TestCustomIterCh(t *testing.T) {
 	const (
-		nilBoundValsErr = "accepted two nil bound values"
+		nilBoundValsErr  = "accepted two nil bound values"
 		generalBoundsErr = "only one bound value"
 	)
 	sm, _, err := newSortedMapFromRandRecords(1000)
@@ -170,7 +170,7 @@ func TestCustomIterCh(t *testing.T) {
 
 	params := IterChParams{
 		Reversed: reversed,
-		BufSize: buffSize,
+		BufSize:  buffSize,
 	}
 
 	if ch, ok := sm.CustomIterCh(params); ok {
@@ -182,8 +182,8 @@ func TestCustomIterCh(t *testing.T) {
 	}
 
 	params = IterChParams{
-		Reversed: reversed,
-		BufSize: buffSize,
+		Reversed:   reversed,
+		BufSize:    buffSize,
 		LowerBound: earlierDate,
 		UpperBound: laterDate,
 	}
@@ -197,8 +197,8 @@ func TestCustomIterCh(t *testing.T) {
 	}
 
 	params = IterChParams{
-		Reversed: reversed,
-		BufSize: buffSize,
+		Reversed:   reversed,
+		BufSize:    buffSize,
 		LowerBound: laterDate,
 		UpperBound: earlierDate,
 	}
@@ -213,8 +213,8 @@ func TestCustomIterCh(t *testing.T) {
 
 	reversed = false
 	params = IterChParams{
-		Reversed: reversed,
-		BufSize: 0,
+		Reversed:   reversed,
+		BufSize:    0,
 		LowerBound: laterDate,
 		UpperBound: earlierDate,
 	}
@@ -370,4 +370,4 @@ func TestBoundedIterFunc(t *testing.T) {
 	}); ok {
 		t.Fatalf("TestBoundedIterFunc failed: %v", nilValErr)
 	}
-}
+}

keys.go

@@ -5,7 +5,7 @@ func (sm *SortedMap) keys(lowerBound, upperBound interface{}) ([]interface{}, bo
 	if idxBounds == nil {
 		return nil, false
 	}
-	return sm.sorted[idxBounds[0]:idxBounds[1] + 1], true
+	return sm.sorted[idxBounds[0] : idxBounds[1]+1], true
 }
 
 // Keys returns a slice containing sorted keys.
@@ -19,4 +19,4 @@ func (sm *SortedMap) Keys() []interface{} {
 // The returned slice is valid until the next modification to the SortedMap structure.
 func (sm *SortedMap) BoundedKeys(lowerBound, upperBound interface{}) ([]interface{}, bool) {
 	return sm.keys(lowerBound, upperBound)
-}
+}

keys_test.go

@@ -49,7 +49,7 @@ func TestBoundedKeysWithNoBoundsReturned(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	if val, ok := sm.BoundedKeys(time.Now().Add(-1 * time.Microsecond), time.Now()); ok {
+	if val, ok := sm.BoundedKeys(time.Now().Add(-1*time.Microsecond), time.Now()); ok {
 		t.Fatalf("Values fall between or are equal to the given bounds when it should not have returned bounds: %+v", sm.idx[val[0]])
 	}
-}
+}