From bce7d1ed9804f88f9b4d1a56027082b2e39d27b6 Mon Sep 17 00:00:00 2001 From: Colin Adler Date: Mon, 31 Jul 2023 19:08:36 +0000 Subject: [PATCH] chore: use `golang.org/x/term` `golang.org/x/crypto/ssh/terminal` is deprecated. --- go.mod | 3 +-- go.sum | 2 -- internal/entryhuman/entry.go | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 11fe29f..ca6640f 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( go.opentelemetry.io/otel/sdk v1.16.0 go.opentelemetry.io/otel/trace v1.16.0 go.uber.org/goleak v1.2.1 - golang.org/x/crypto v0.11.0 + golang.org/x/term v0.10.0 golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e ) @@ -32,7 +32,6 @@ require ( go.opentelemetry.io/otel/metric v1.16.0 // indirect golang.org/x/net v0.12.0 // indirect golang.org/x/sys v0.10.0 // indirect - golang.org/x/term v0.10.0 // indirect golang.org/x/text v0.11.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230706204954-ccb25ca9f130 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130 // indirect diff --git a/go.sum b/go.sum index a23ef10..aefa004 100644 --- a/go.sum +++ b/go.sum @@ -49,8 +49,6 @@ go.opentelemetry.io/otel/trace v1.16.0 h1:8JRpaObFoW0pxuVPapkgH8UhHQj+bJW8jJsCZE go.opentelemetry.io/otel/trace v1.16.0/go.mod h1:Yt9vYq1SdNz3xdjZZK7wcXv1qv2pwLkqr2QVwea0ef0= go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A= go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/internal/entryhuman/entry.go b/internal/entryhuman/entry.go index a6d30f9..cd63ccb 100644 --- a/internal/entryhuman/entry.go +++ b/internal/entryhuman/entry.go @@ -17,7 +17,7 @@ import ( "github.com/charmbracelet/lipgloss" "github.com/muesli/termenv" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" "golang.org/x/xerrors" "cdr.dev/slog" @@ -227,7 +227,7 @@ func isTTY(w io.Writer) bool { f, ok := w.(interface { Fd() uintptr }) - return ok && terminal.IsTerminal(int(f.Fd())) + return ok && term.IsTerminal(int(f.Fd())) } func shouldColor(w io.Writer) bool {