Merge pull request #34 from gochore/dev

gochore · Feb 9, 2021 · d60f1ac · d60f1ac
2 parents 4aa4d44 + d8a6a1c
commit d60f1ac
Show file tree

Hide file tree

Showing 29 changed files with 1,902 additions and 897 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,9 @@
-generage:
+generate:
 	rm -f gen_*.go
 	go run cmd/generate/main.go
+
 test:
 	go test -v
+
+all: generate test
+
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ func main() {
 	})
 
 	// merge data
-	slice2 := timeseq.Ints{
+	seq2 := timeseq.WrapIntSeq(timeseq.Ints{
 		{
 			Time:  now.Add(time.Second),
 			Value: 1,
@@ -103,8 +103,8 @@ func main() {
 			Time:  now.Add(-time.Second),
 			Value: 2,
 		},
-	}
-	if err := seq.Merge(func(t time.Time, v1, v2 *int) *int {
+	})
+	newSeq := seq.Merge(func(t time.Time, v1, v2 *int) *int {
 		if v1 == nil {
 			return v2
 		}
@@ -113,9 +113,9 @@ func main() {
 		}
 		ret := *v1 + *v2
 		return &ret
-	}, slice2); err != nil {
-		panic(err)
-	}
+	}, seq2)
+
+	_ = newSeq
 }
 ```
 
diff --git a/_example/simple/main.go b/_example/simple/main.go
@@ -67,7 +67,7 @@ func main() {
 	})
 
 	// merge data
-	slice2 := timeseq.Ints{
+	seq2 := timeseq.WrapIntSeq(timeseq.Ints{
 		{
 			Time:  now.Add(time.Second),
 			Value: 1,
@@ -76,8 +76,8 @@ func main() {
 			Time:  now.Add(-time.Second),
 			Value: 2,
 		},
-	}
-	if err := seq.Merge(func(t time.Time, v1, v2 *int) *int {
+	})
+	newSeq := seq.Merge(func(t time.Time, v1, v2 *int) *int {
 		if v1 == nil {
 			return v2
 		}
@@ -86,7 +86,7 @@ func main() {
 		}
 		ret := *v1 + *v2
 		return &ret
-	}, slice2); err != nil {
-		panic(err)
-	}
+	}, seq2)
+
+	_ = newSeq
 }