Remove merge package, move Merge to input

README.md

@@ -115,7 +115,6 @@ declpac/
 │   └── main.go         # Entry point
 ├── pkg/
 │   ├── input/          # State file/stdin reading
-│   ├── merge/          # Package merging
 │   ├── fetch/          # Package resolution
 │   │   ├── aur/        # AUR support
 │   │   └── alpm/       # ALPM support

cmd/declpac/main.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/Riyyi/declpac/pkg/input"
 	"github.com/Riyyi/declpac/pkg/log"
-	"github.com/Riyyi/declpac/pkg/merge"
 	"github.com/Riyyi/declpac/pkg/output"
 	"github.com/Riyyi/declpac/pkg/pacman"
 	"github.com/Riyyi/declpac/pkg/pacman/read"
@@ -75,7 +74,7 @@ func run(cfg *Config) error {
 	}
 	log.Debug("run: packages read (%.2fs)", time.Since(start).Seconds())
 
-	merged, err := merge.Merge(packages)
+	merged, err := input.Merge(packages)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "error: %v\n", err)
 		return err

pkg/input/input.go

@@ -2,11 +2,25 @@ package input
 
 import (
 	"bufio"
+	"errors"
 	"os"
 	"path/filepath"
 	"strings"
 )
 
+var ErrEmptyList = errors.New("package list is empty")
+
+func Merge(packages map[string]bool) ([]string, error) {
+	result := make([]string, 0, len(packages))
+	for name := range packages {
+		result = append(result, name)
+	}
+	if len(result) == 0 {
+		return nil, ErrEmptyList
+	}
+	return result, nil
+}
+
 func ReadPackages(stateFiles []string) (map[string]bool, error) {
 	packages := make(map[string]bool)
 

pkg/merge/merge.go

@@ -1,16 +0,0 @@
-package merge
-
-import "errors"
-
-var ErrEmptyList = errors.New("package list is empty")
-
-func Merge(packages map[string]bool) ([]string, error) {
-	result := make([]string, 0, len(packages))
-	for name := range packages {
-		result = append(result, name)
-	}
-	if len(result) == 0 {
-		return nil, ErrEmptyList
-	}
-	return result, nil
-}