chore(core): cleanup

* Fix deprecation of combra.ExactValidArgs

* Remove unreachable codepath

* Fix deprecation of ioutil

---------

Co-authored-by: 0WN463 <>

cmd/completion.go

@@ -43,7 +43,7 @@ $ qrcp completion fish > ~/.config/fish/completions/qrcp.fish
 `,
 	DisableFlagsInUseLine: true,
 	ValidArgs:             []string{"bash", "zsh", "fish", "powershell"},
-	Args:                  cobra.ExactValidArgs(1),
+	Args:                  cobra.MatchAll(cobra.ExactArgs(1), cobra.OnlyValidArgs),
 	Run: func(cmd *cobra.Command, args []string) {
 		switch args[0] {
 		case "bash":

cmd/send.go

@@ -20,9 +20,6 @@ func sendCmdFunc(command *cobra.Command, args []string) error {
 		return err
 	}
 	cfg := config.New(app)
-	if err != nil {
-		return err
-	}
 	srv, err := server.New(&cfg)
 	if err != nil {
 		return err

config/config_test.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -19,12 +18,12 @@ func TestNew(t *testing.T) {
 		panic(err)
 	}
 	testdir := filepath.Join(filepath.Dir(f), "testdata")
-	tempfile, err := ioutil.TempFile("", "qrcp*tmp.yml")
+	tempfile, err := os.CreateTemp("", "qrcp*tmp.yml")
 	if err != nil {
 		t.Skip()
 	}
 	defer os.Remove(tempfile.Name())
-	partialconfig, err := ioutil.TempFile("", "qrcp*partial.yml")
+	partialconfig, err := os.CreateTemp("", "qrcp*partial.yml")
 	if err != nil {
 		panic(err)
 	}

config/migrate.go

@@ -2,7 +2,6 @@ package config
 
 import (
 	"encoding/json"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -20,7 +19,7 @@ func Migrate(app application.App) (bool, error) {
 	if _, err := os.Stat(oldConfigFile); os.IsNotExist(err) {
 		return false, nil
 	}
-	oldConfigFileBytes, err := ioutil.ReadFile(oldConfigFile)
+	oldConfigFileBytes, err := os.ReadFile(oldConfigFile)
 	if err != nil {
 		panic(err)
 	}
@@ -32,7 +31,7 @@ func Migrate(app application.App) (bool, error) {
 	if err != nil {
 		panic(err)
 	}
-	if err := ioutil.WriteFile(newConfigFile, newConfigFileBytes, 0644); err != nil {
+	if err := os.WriteFile(newConfigFile, newConfigFileBytes, 0644); err != nil {
 		panic(err)
 	}
 	// Delete old file

util/util.go

@@ -5,7 +5,6 @@ import (
 	"encoding/base64"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net"
 	"os"
 	"os/user"
@@ -158,7 +157,7 @@ func FindIP(iface net.Interface) (string, error) {
 
 // ReadFilenames from dir
 func ReadFilenames(dir string) []string {
-	files, err := ioutil.ReadDir(dir)
+	files, err := os.ReadDir(dir)
 	if err != nil {
 		panic(err)
 	}