Use SIMD base64 everywhere

kittens/clipboard/legacy.go

@@ -4,13 +4,14 @@ package clipboard
 
 import (
 	"bytes"
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
 	"os"
 	"strings"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tty"
 	"github.com/kovidgoyal/kitty/tools/tui/loop"
 	"github.com/kovidgoyal/kitty/tools/utils"

kittens/clipboard/read.go

@@ -4,7 +4,6 @@ package clipboard
 
 import (
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"image"
 	"io"
@@ -14,6 +13,8 @@ import (
 	"strings"
 	"sync"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tty"
 	"github.com/kovidgoyal/kitty/tools/tui/loop"
 	"github.com/kovidgoyal/kitty/tools/utils"

kittens/clipboard/write.go

@@ -3,7 +3,6 @@
 package clipboard
 
 import (
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
@@ -12,6 +11,8 @@ import (
 	"slices"
 	"strings"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tui/loop"
 	"github.com/kovidgoyal/kitty/tools/utils"
 )

kittens/notify/main.go

@@ -2,7 +2,6 @@ package notify
 
 import (
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"image"
 	"io"
@@ -12,6 +11,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/cli"
 	"github.com/kovidgoyal/kitty/tools/tty"
 	"github.com/kovidgoyal/kitty/tools/tui/loop"

kittens/ssh/main.go

@@ -7,7 +7,6 @@ import (
 	"bytes"
 	"compress/gzip"
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -28,9 +27,11 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/kovidgoyal/kitty"
+	"github.com/emmansun/base64"
+	"golang.org/x/sys/unix"
 
 	"github.com/kovidgoyal/go-shm"
+	"github.com/kovidgoyal/kitty"
 	"github.com/kovidgoyal/kitty/tools/cli"
 	"github.com/kovidgoyal/kitty/tools/themes"
 	"github.com/kovidgoyal/kitty/tools/tty"
@@ -40,8 +41,6 @@ import (
 	"github.com/kovidgoyal/kitty/tools/utils"
 	"github.com/kovidgoyal/kitty/tools/utils/secrets"
 	"github.com/kovidgoyal/kitty/tools/utils/shlex"
-
-	"golang.org/x/sys/unix"
 )
 
 var _ = fmt.Print

kittens/transfer/ftc.go

@@ -3,7 +3,6 @@
 package transfer
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/fs"
@@ -14,6 +13,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty"
 	"github.com/kovidgoyal/kitty/tools/utils"
 )

tools/cmd/at/run.go

@@ -1,12 +1,13 @@
 package at
 
 import (
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
 	"os"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tty"
 )
 

tools/cmd/at/send_text.go

@@ -3,15 +3,17 @@
 package at
 
 import (
-	"encoding/base64"
 	"errors"
+	"io"
+	"os"
+	"strings"
+
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tty"
 	"github.com/kovidgoyal/kitty/tools/tui/loop"
 	"github.com/kovidgoyal/kitty/tools/utils"
 	"github.com/kovidgoyal/kitty/tools/utils/shlex"
-	"io"
-	"os"
-	"strings"
 )
 
 var end_reading_from_stdin = errors.New("end reading from STDIN")

tools/cmd/at/set_window_logo.go

@@ -4,13 +4,14 @@ package at
 
 import (
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"image"
 	"io"
 	"os"
 	"strings"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/utils/images"
 )
 

tools/cmd/edit_in_kitty/main.go

@@ -4,7 +4,6 @@ package edit_in_kitty
 
 import (
 	"bytes"
-	"encoding/base64"
 	"fmt"
 	"io"
 	"io/fs"
@@ -12,6 +11,7 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/emmansun/base64"
 	"golang.org/x/sys/unix"
 
 	"github.com/kovidgoyal/kitty/tools/cli"

tools/cmd/mouse_demo/main.go

@@ -3,13 +3,14 @@
 package mouse_demo
 
 import (
-	"encoding/base64"
 	"fmt"
 	"net/url"
 	"path/filepath"
 	"strconv"
 	"strings"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/tty"
 	"github.com/kovidgoyal/kitty/tools/tui/loop"
 )

tools/tty/tty.go

@@ -3,7 +3,6 @@
 package tty
 
 import (
-	"encoding/base64"
 	"errors"
 	"fmt"
 	"io"
@@ -12,6 +11,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/emmansun/base64"
 	"golang.org/x/sys/unix"
 
 	"github.com/kovidgoyal/kitty/tools/utils"

tools/tui/dcs_to_kitty.go

@@ -3,9 +3,10 @@
 package tui
 
 import (
-	"encoding/base64"
 	"fmt"
 
+	"github.com/emmansun/base64"
+
 	"github.com/kovidgoyal/kitty/tools/utils"
 )
 

tools/tui/graphics/command_test.go

@@ -5,12 +5,13 @@ package graphics
 import (
 	"bytes"
 	"compress/zlib"
-	"encoding/base64"
 	"fmt"
 	"io"
 	"strings"
 	"testing"
 
+	"github.com/emmansun/base64"
+
 	"github.com/google/go-cmp/cmp"
 	"golang.org/x/exp/rand"
 )

tools/tui/loop/api.go

@@ -5,13 +5,13 @@ package loop
 import (
 	"crypto/hmac"
 	"crypto/sha256"
-	"encoding/base64"
 	"encoding/hex"
 	"fmt"
 	"os"
 	"strings"
 	"time"
 
+	"github.com/emmansun/base64"
 	"golang.org/x/sys/unix"
 
 	"github.com/kovidgoyal/go-parallel"

tools/utils/secrets/tokens.go

@@ -4,9 +4,10 @@ package secrets
 
 import (
 	"crypto/rand"
-	"encoding/base64"
 	"encoding/hex"
 	"fmt"
+
+	"github.com/emmansun/base64"
 )
 
 var _ = fmt.Print