From 51573ec00c47f911e5c17bbd443295ea0882fcf5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Mar 2026 12:27:21 +0000 Subject: [PATCH] chore(deps): bump github.com/charmbracelet/log from 0.4.2 to 1.0.0 Bumps [github.com/charmbracelet/log](https://github.com/charmbracelet/log) from 0.4.2 to 1.0.0. - [Release notes](https://github.com/charmbracelet/log/releases) - [Commits](https://github.com/charmbracelet/log/compare/v0.4.2...v1.0.0) --- updated-dependencies: - dependency-name: github.com/charmbracelet/log dependency-version: 1.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 4 +- go.sum | 8 ++-- .../charmbracelet/log/.golangci.yml | 8 +++- vendor/github.com/charmbracelet/log/json.go | 2 +- vendor/github.com/charmbracelet/log/logfmt.go | 2 +- vendor/github.com/charmbracelet/log/logger.go | 38 +++++++++---------- .../charmbracelet/log/logger_121.go | 4 +- .../charmbracelet/log/logger_no121.go | 4 +- .../github.com/charmbracelet/log/options.go | 2 +- vendor/github.com/charmbracelet/log/pkg.go | 30 +++++++-------- vendor/github.com/charmbracelet/log/text.go | 4 +- .../github.com/go-logfmt/logfmt/CHANGELOG.md | 10 +++++ vendor/github.com/go-logfmt/logfmt/encode.go | 24 ++++++------ .../github.com/go-logfmt/logfmt/jsonstring.go | 8 ++-- vendor/modules.txt | 8 ++-- 15 files changed, 86 insertions(+), 70 deletions(-) diff --git a/go.mod b/go.mod index dfee1440..51bdec42 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/charmbracelet/bubbles v1.0.0 github.com/charmbracelet/bubbletea v1.3.10 github.com/charmbracelet/lipgloss v1.1.0 - github.com/charmbracelet/log v0.4.2 + github.com/charmbracelet/log v1.0.0 github.com/charmbracelet/x/term v0.2.2 github.com/defenseunicorns/go-oscal v0.7.0 github.com/gemaraproj/go-gemara v0.0.1 @@ -35,7 +35,7 @@ require ( github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect github.com/fatih/color v1.18.0 // indirect - github.com/go-logfmt/logfmt v0.6.0 // indirect + github.com/go-logfmt/logfmt v0.6.1 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/uuid v1.6.0 // indirect github.com/hashicorp/yamux v0.1.2 // indirect diff --git a/go.sum b/go.sum index 463ada23..41524c36 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk= github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY= github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30= -github.com/charmbracelet/log v0.4.2 h1:hYt8Qj6a8yLnvR+h7MwsJv/XvmBJXiueUcI3cIxsyig= -github.com/charmbracelet/log v0.4.2/go.mod h1:qifHGX/tc7eluv2R6pWIpyHDDrrb/AG71Pf2ysQu5nw= +github.com/charmbracelet/log v1.0.0 h1:HVVVMmfOorfj3BA9i8X8UL69Hoz9lI0PYwXfJvOdRc4= +github.com/charmbracelet/log v1.0.0/go.mod h1:uYgY3SmLpwJWxmlrPwXvzVYujxis1vAKRV/0VQB7yWA= github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8= github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ= github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI= @@ -43,8 +43,8 @@ github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= github.com/gemaraproj/go-gemara v0.0.1 h1:5LVVN6gchiOvC2T6j2nohso16U2uTIcPg1jhD4TDWQQ= github.com/gemaraproj/go-gemara v0.0.1/go.mod h1:diPp9MxIzNT8pyk4lP4odg5UeSoGCkSUoIy0JnBzCcU= -github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4= -github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= +github.com/go-logfmt/logfmt v0.6.1 h1:4hvbpePJKnIzH1B+8OR/JPbTx37NktoI9LE2QZBBkvE= +github.com/go-logfmt/logfmt v0.6.1/go.mod h1:EV2pOAQoZaT1ZXZbqDl5hrymndi4SY9ED9/z6CO0XAk= github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= diff --git a/vendor/github.com/charmbracelet/log/.golangci.yml b/vendor/github.com/charmbracelet/log/.golangci.yml index be61d89b..c90f0316 100644 --- a/vendor/github.com/charmbracelet/log/.golangci.yml +++ b/vendor/github.com/charmbracelet/log/.golangci.yml @@ -7,7 +7,6 @@ linters: - exhaustive - goconst - godot - - godox - gomoddirectives - goprintffuncname - gosec @@ -27,9 +26,16 @@ linters: - whitespace - wrapcheck exclusions: + rules: + - text: '(slog|log)\.\w+' + linters: + - noctx generated: lax presets: - common-false-positives + settings: + exhaustive: + default-signifies-exhaustive: true issues: max-issues-per-linter: 0 max-same-issues: 0 diff --git a/vendor/github.com/charmbracelet/log/json.go b/vendor/github.com/charmbracelet/log/json.go index f84083d4..0d06bbc2 100644 --- a/vendor/github.com/charmbracelet/log/json.go +++ b/vendor/github.com/charmbracelet/log/json.go @@ -7,7 +7,7 @@ import ( "time" ) -func (l *Logger) jsonFormatter(keyvals ...interface{}) { +func (l *Logger) jsonFormatter(keyvals ...any) { jw := &jsonWriter{w: &l.b} jw.start() diff --git a/vendor/github.com/charmbracelet/log/logfmt.go b/vendor/github.com/charmbracelet/log/logfmt.go index 2878b975..332a4b71 100644 --- a/vendor/github.com/charmbracelet/log/logfmt.go +++ b/vendor/github.com/charmbracelet/log/logfmt.go @@ -8,7 +8,7 @@ import ( "github.com/go-logfmt/logfmt" ) -func (l *Logger) logfmtFormatter(keyvals ...interface{}) { +func (l *Logger) logfmtFormatter(keyvals ...any) { e := logfmt.NewEncoder(&l.b) for i := 0; i < len(keyvals); i += 2 { diff --git a/vendor/github.com/charmbracelet/log/logger.go b/vendor/github.com/charmbracelet/log/logger.go index 19ed409d..fea85216 100644 --- a/vendor/github.com/charmbracelet/log/logger.go +++ b/vendor/github.com/charmbracelet/log/logger.go @@ -41,19 +41,19 @@ type Logger struct { reportCaller bool reportTimestamp bool - fields []interface{} + fields []any helpers *sync.Map styles *Styles } // Logf logs a message with formatting. -func (l *Logger) Logf(level Level, format string, args ...interface{}) { +func (l *Logger) Logf(level Level, format string, args ...any) { l.Log(level, fmt.Sprintf(format, args...)) } // Log logs the given message with the given keyvals for the given level. -func (l *Logger) Log(level Level, msg interface{}, keyvals ...interface{}) { +func (l *Logger) Log(level Level, msg any, keyvals ...any) { if atomic.LoadUint32(&l.isDiscard) != 0 { return } @@ -81,8 +81,8 @@ func (l *Logger) Log(level Level, msg interface{}, keyvals ...interface{}) { l.handle(level, l.timeFunc(time.Now()), []runtime.Frame{frame}, msg, keyvals...) } -func (l *Logger) handle(level Level, ts time.Time, frames []runtime.Frame, msg interface{}, keyvals ...interface{}) { - var kvs []interface{} +func (l *Logger) handle(level Level, ts time.Time, frames []runtime.Frame, msg any, keyvals ...any) { + var kvs []any if l.reportTimestamp && !ts.IsZero() { kvs = append(kvs, TimestampKey, ts) } @@ -327,7 +327,7 @@ func (l *Logger) SetStyles(s *Styles) { } // With returns a new logger with the given keyvals added. -func (l *Logger) With(keyvals ...interface{}) *Logger { +func (l *Logger) With(keyvals ...any) *Logger { var st Styles l.mu.Lock() sl := *l @@ -336,7 +336,7 @@ func (l *Logger) With(keyvals ...interface{}) *Logger { sl.b = bytes.Buffer{} sl.mu = &sync.RWMutex{} sl.helpers = &sync.Map{} - sl.fields = append(make([]interface{}, 0, len(l.fields)+len(keyvals)), l.fields...) + sl.fields = append(make([]any, 0, len(l.fields)+len(keyvals)), l.fields...) sl.fields = append(sl.fields, keyvals...) sl.styles = &st return &sl @@ -350,63 +350,63 @@ func (l *Logger) WithPrefix(prefix string) *Logger { } // Debug prints a debug message. -func (l *Logger) Debug(msg interface{}, keyvals ...interface{}) { +func (l *Logger) Debug(msg any, keyvals ...any) { l.Log(DebugLevel, msg, keyvals...) } // Info prints an info message. -func (l *Logger) Info(msg interface{}, keyvals ...interface{}) { +func (l *Logger) Info(msg any, keyvals ...any) { l.Log(InfoLevel, msg, keyvals...) } // Warn prints a warning message. -func (l *Logger) Warn(msg interface{}, keyvals ...interface{}) { +func (l *Logger) Warn(msg any, keyvals ...any) { l.Log(WarnLevel, msg, keyvals...) } // Error prints an error message. -func (l *Logger) Error(msg interface{}, keyvals ...interface{}) { +func (l *Logger) Error(msg any, keyvals ...any) { l.Log(ErrorLevel, msg, keyvals...) } // Fatal prints a fatal message and exits. -func (l *Logger) Fatal(msg interface{}, keyvals ...interface{}) { +func (l *Logger) Fatal(msg any, keyvals ...any) { l.Log(FatalLevel, msg, keyvals...) os.Exit(1) } // Print prints a message with no level. -func (l *Logger) Print(msg interface{}, keyvals ...interface{}) { +func (l *Logger) Print(msg any, keyvals ...any) { l.Log(noLevel, msg, keyvals...) } // Debugf prints a debug message with formatting. -func (l *Logger) Debugf(format string, args ...interface{}) { +func (l *Logger) Debugf(format string, args ...any) { l.Log(DebugLevel, fmt.Sprintf(format, args...)) } // Infof prints an info message with formatting. -func (l *Logger) Infof(format string, args ...interface{}) { +func (l *Logger) Infof(format string, args ...any) { l.Log(InfoLevel, fmt.Sprintf(format, args...)) } // Warnf prints a warning message with formatting. -func (l *Logger) Warnf(format string, args ...interface{}) { +func (l *Logger) Warnf(format string, args ...any) { l.Log(WarnLevel, fmt.Sprintf(format, args...)) } // Errorf prints an error message with formatting. -func (l *Logger) Errorf(format string, args ...interface{}) { +func (l *Logger) Errorf(format string, args ...any) { l.Log(ErrorLevel, fmt.Sprintf(format, args...)) } // Fatalf prints a fatal message with formatting and exits. -func (l *Logger) Fatalf(format string, args ...interface{}) { +func (l *Logger) Fatalf(format string, args ...any) { l.Log(FatalLevel, fmt.Sprintf(format, args...)) os.Exit(1) } // Printf prints a message with no level and formatting. -func (l *Logger) Printf(format string, args ...interface{}) { +func (l *Logger) Printf(format string, args ...any) { l.Log(noLevel, fmt.Sprintf(format, args...)) } diff --git a/vendor/github.com/charmbracelet/log/logger_121.go b/vendor/github.com/charmbracelet/log/logger_121.go index 478e1a0d..983e36ab 100644 --- a/vendor/github.com/charmbracelet/log/logger_121.go +++ b/vendor/github.com/charmbracelet/log/logger_121.go @@ -36,7 +36,7 @@ func (l *Logger) Handle(ctx context.Context, record slog.Record) error { return nil } - fields := make([]interface{}, 0, record.NumAttrs()*2) + fields := make([]any, 0, record.NumAttrs()*2) record.Attrs(func(a slog.Attr) bool { fields = append(fields, a.Key, a.Value) return true @@ -52,7 +52,7 @@ func (l *Logger) Handle(ctx context.Context, record slog.Record) error { // // Implements slog.Handler. func (l *Logger) WithAttrs(attrs []slog.Attr) slog.Handler { - fields := make([]interface{}, 0, len(attrs)*2) + fields := make([]any, 0, len(attrs)*2) for _, attr := range attrs { fields = append(fields, attr.Key, attr.Value) } diff --git a/vendor/github.com/charmbracelet/log/logger_no121.go b/vendor/github.com/charmbracelet/log/logger_no121.go index ea8bb108..5eee020b 100644 --- a/vendor/github.com/charmbracelet/log/logger_no121.go +++ b/vendor/github.com/charmbracelet/log/logger_no121.go @@ -33,7 +33,7 @@ func (l *Logger) Enabled(_ context.Context, level slog.Level) bool { // // Implements slog.Handler. func (l *Logger) Handle(_ context.Context, record slog.Record) error { - fields := make([]interface{}, 0, record.NumAttrs()*2) + fields := make([]any, 0, record.NumAttrs()*2) record.Attrs(func(a slog.Attr) bool { fields = append(fields, a.Key, a.Value) return true @@ -49,7 +49,7 @@ func (l *Logger) Handle(_ context.Context, record slog.Record) error { // // Implements slog.Handler. func (l *Logger) WithAttrs(attrs []slog.Attr) slog.Handler { - fields := make([]interface{}, 0, len(attrs)*2) + fields := make([]any, 0, len(attrs)*2) for _, attr := range attrs { fields = append(fields, attr.Key, attr.Value) } diff --git a/vendor/github.com/charmbracelet/log/options.go b/vendor/github.com/charmbracelet/log/options.go index 8737d7d9..ef8e54a3 100644 --- a/vendor/github.com/charmbracelet/log/options.go +++ b/vendor/github.com/charmbracelet/log/options.go @@ -55,7 +55,7 @@ type Options struct { // CallerOffset is the caller format for the logger. The default is 0. CallerOffset int // Fields is the fields for the logger. The default is no fields. - Fields []interface{} + Fields []any // Formatter is the formatter for the logger. The default is TextFormatter. Formatter Formatter } diff --git a/vendor/github.com/charmbracelet/log/pkg.go b/vendor/github.com/charmbracelet/log/pkg.go index 712bb38f..ea3f0092 100644 --- a/vendor/github.com/charmbracelet/log/pkg.go +++ b/vendor/github.com/charmbracelet/log/pkg.go @@ -155,7 +155,7 @@ func GetPrefix() string { } // With returns a new logger with the given keyvals. -func With(keyvals ...interface{}) *Logger { +func With(keyvals ...any) *Logger { return Default().With(keyvals...) } @@ -172,74 +172,74 @@ func Helper() { } // Log logs a message with the given level. -func Log(level Level, msg interface{}, keyvals ...interface{}) { +func Log(level Level, msg any, keyvals ...any) { Default().Log(level, msg, keyvals...) } // Debug logs a debug message. -func Debug(msg interface{}, keyvals ...interface{}) { +func Debug(msg any, keyvals ...any) { Default().Log(DebugLevel, msg, keyvals...) } // Info logs an info message. -func Info(msg interface{}, keyvals ...interface{}) { +func Info(msg any, keyvals ...any) { Default().Log(InfoLevel, msg, keyvals...) } // Warn logs a warning message. -func Warn(msg interface{}, keyvals ...interface{}) { +func Warn(msg any, keyvals ...any) { Default().Log(WarnLevel, msg, keyvals...) } // Error logs an error message. -func Error(msg interface{}, keyvals ...interface{}) { +func Error(msg any, keyvals ...any) { Default().Log(ErrorLevel, msg, keyvals...) } // Fatal logs a fatal message and exit. -func Fatal(msg interface{}, keyvals ...interface{}) { +func Fatal(msg any, keyvals ...any) { Default().Log(FatalLevel, msg, keyvals...) os.Exit(1) } // Print logs a message with no level. -func Print(msg interface{}, keyvals ...interface{}) { +func Print(msg any, keyvals ...any) { Default().Log(noLevel, msg, keyvals...) } // Logf logs a message with formatting and level. -func Logf(level Level, format string, args ...interface{}) { +func Logf(level Level, format string, args ...any) { Default().Logf(level, format, args...) } // Debugf logs a debug message with formatting. -func Debugf(format string, args ...interface{}) { +func Debugf(format string, args ...any) { Default().Log(DebugLevel, fmt.Sprintf(format, args...)) } // Infof logs an info message with formatting. -func Infof(format string, args ...interface{}) { +func Infof(format string, args ...any) { Default().Log(InfoLevel, fmt.Sprintf(format, args...)) } // Warnf logs a warning message with formatting. -func Warnf(format string, args ...interface{}) { +func Warnf(format string, args ...any) { Default().Log(WarnLevel, fmt.Sprintf(format, args...)) } // Errorf logs an error message with formatting. -func Errorf(format string, args ...interface{}) { +func Errorf(format string, args ...any) { Default().Log(ErrorLevel, fmt.Sprintf(format, args...)) } // Fatalf logs a fatal message with formatting and exit. -func Fatalf(format string, args ...interface{}) { +func Fatalf(format string, args ...any) { Default().Log(FatalLevel, fmt.Sprintf(format, args...)) os.Exit(1) } // Printf logs a message with formatting and no level. -func Printf(format string, args ...interface{}) { +func Printf(format string, args ...any) { Default().Log(noLevel, fmt.Sprintf(format, args...)) } diff --git a/vendor/github.com/charmbracelet/log/text.go b/vendor/github.com/charmbracelet/log/text.go index a3775e83..8d549160 100644 --- a/vendor/github.com/charmbracelet/log/text.go +++ b/vendor/github.com/charmbracelet/log/text.go @@ -62,7 +62,7 @@ const ( ) var bufPool = sync.Pool{ - New: func() interface{} { + New: func() any { return new(strings.Builder) }, } @@ -164,7 +164,7 @@ func writeSpace(w io.Writer, first bool) { } } -func (l *Logger) textFormatter(keyvals ...interface{}) { +func (l *Logger) textFormatter(keyvals ...any) { st := l.styles lenKeyvals := len(keyvals) diff --git a/vendor/github.com/go-logfmt/logfmt/CHANGELOG.md b/vendor/github.com/go-logfmt/logfmt/CHANGELOG.md index 8f349c4b..9a7c0ca7 100644 --- a/vendor/github.com/go-logfmt/logfmt/CHANGELOG.md +++ b/vendor/github.com/go-logfmt/logfmt/CHANGELOG.md @@ -5,6 +5,15 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.6.1] - 2025-10-05 + +### Fixed + +- Encode DEL (0x7f) control character by [@spaceone] +- Modernize code through Go 1.21 by [@ChrisHines] + +[0.6.1]: https://github.com/go-logfmt/logfmt/compare/v0.6.0...v0.6.1 + ## [0.6.0] - 2023-01-30 [0.6.0]: https://github.com/go-logfmt/logfmt/compare/v0.5.1...v0.6.0 @@ -80,3 +89,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [@judwhite]: https://github.com/judwhite [@nussjustin]: https://github.com/nussjustin [@alexanderjophus]: https://github.com/alexanderjophus +[@spaceone]: https://github.com/spaceone diff --git a/vendor/github.com/go-logfmt/logfmt/encode.go b/vendor/github.com/go-logfmt/logfmt/encode.go index 4ea9d239..d8f69351 100644 --- a/vendor/github.com/go-logfmt/logfmt/encode.go +++ b/vendor/github.com/go-logfmt/logfmt/encode.go @@ -13,7 +13,7 @@ import ( // MarshalKeyvals returns the logfmt encoding of keyvals, a variadic sequence // of alternating keys and values. -func MarshalKeyvals(keyvals ...interface{}) ([]byte, error) { +func MarshalKeyvals(keyvals ...any) ([]byte, error) { buf := &bytes.Buffer{} if err := NewEncoder(buf).EncodeKeyvals(keyvals...); err != nil { return nil, err @@ -45,7 +45,7 @@ var ( // EncodeKeyval writes the logfmt encoding of key and value to the stream. A // single space is written before the second and subsequent keys in a record. // Nothing is written if a non-nil error is returned. -func (enc *Encoder) EncodeKeyval(key, value interface{}) error { +func (enc *Encoder) EncodeKeyval(key, value any) error { enc.scratch.Reset() if enc.needSep { if _, err := enc.scratch.Write(space); err != nil { @@ -72,7 +72,7 @@ func (enc *Encoder) EncodeKeyval(key, value interface{}) error { // unsupported type or that cause a MarshalerError are replaced by their error // but do not cause EncodeKeyvals to return an error. If a non-nil error is // returned some key/value pairs may not have be written. -func (enc *Encoder) EncodeKeyvals(keyvals ...interface{}) error { +func (enc *Encoder) EncodeKeyvals(keyvals ...any) error { if len(keyvals) == 0 { return nil } @@ -122,7 +122,7 @@ var ErrUnsupportedKeyType = errors.New("unsupported key type") // unsupported type. var ErrUnsupportedValueType = errors.New("unsupported value type") -func writeKey(w io.Writer, key interface{}) error { +func writeKey(w io.Writer, key any) error { if key == nil { return ErrNilKey } @@ -155,7 +155,7 @@ func writeKey(w io.Writer, key interface{}) error { switch rkey.Kind() { case reflect.Array, reflect.Chan, reflect.Func, reflect.Map, reflect.Slice, reflect.Struct: return ErrUnsupportedKeyType - case reflect.Ptr: + case reflect.Pointer: if rkey.IsNil() { return ErrNilKey } @@ -170,7 +170,7 @@ func writeKey(w io.Writer, key interface{}) error { // functions it causes them to remove invalid key runes from strings or byte // slices respectively. func keyRuneFilter(r rune) rune { - if r <= ' ' || r == '=' || r == '"' || r == utf8.RuneError { + if r <= ' ' || r == '=' || r == '"' || r == 0x7f || r == utf8.RuneError { return -1 } return r @@ -194,7 +194,7 @@ func writeBytesKey(w io.Writer, key []byte) error { return err } -func writeValue(w io.Writer, value interface{}) error { +func writeValue(w io.Writer, value any) error { switch v := value.(type) { case nil: return writeBytesValue(w, null) @@ -222,7 +222,7 @@ func writeValue(w io.Writer, value interface{}) error { switch rvalue.Kind() { case reflect.Array, reflect.Chan, reflect.Func, reflect.Map, reflect.Slice, reflect.Struct: return ErrUnsupportedValueType - case reflect.Ptr: + case reflect.Pointer: if rvalue.IsNil() { return writeBytesValue(w, null) } @@ -233,7 +233,7 @@ func writeValue(w io.Writer, value interface{}) error { } func needsQuotedValueRune(r rune) bool { - return r <= ' ' || r == '=' || r == '"' || r == utf8.RuneError + return r <= ' ' || r == '=' || r == '"' || r == 0x7f || r == utf8.RuneError } func writeStringValue(w io.Writer, value string, ok bool) error { @@ -276,7 +276,7 @@ func (enc *Encoder) Reset() { func safeError(err error) (s string, ok bool) { defer func() { if panicVal := recover(); panicVal != nil { - if v := reflect.ValueOf(err); v.Kind() == reflect.Ptr && v.IsNil() { + if v := reflect.ValueOf(err); v.Kind() == reflect.Pointer && v.IsNil() { s, ok = "null", false } else { s, ok = fmt.Sprintf("PANIC:%v", panicVal), false @@ -290,7 +290,7 @@ func safeError(err error) (s string, ok bool) { func safeString(str fmt.Stringer) (s string, ok bool) { defer func() { if panicVal := recover(); panicVal != nil { - if v := reflect.ValueOf(str); v.Kind() == reflect.Ptr && v.IsNil() { + if v := reflect.ValueOf(str); v.Kind() == reflect.Pointer && v.IsNil() { s, ok = "null", false } else { s, ok = fmt.Sprintf("PANIC:%v", panicVal), true @@ -304,7 +304,7 @@ func safeString(str fmt.Stringer) (s string, ok bool) { func safeMarshal(tm encoding.TextMarshaler) (b []byte, err error) { defer func() { if panicVal := recover(); panicVal != nil { - if v := reflect.ValueOf(tm); v.Kind() == reflect.Ptr && v.IsNil() { + if v := reflect.ValueOf(tm); v.Kind() == reflect.Pointer && v.IsNil() { b, err = nil, nil } else { b, err = nil, fmt.Errorf("panic when marshalling: %s", panicVal) diff --git a/vendor/github.com/go-logfmt/logfmt/jsonstring.go b/vendor/github.com/go-logfmt/logfmt/jsonstring.go index 030ac85f..26e1b1c1 100644 --- a/vendor/github.com/go-logfmt/logfmt/jsonstring.go +++ b/vendor/github.com/go-logfmt/logfmt/jsonstring.go @@ -19,7 +19,7 @@ import ( var hex = "0123456789abcdef" var bufferPool = sync.Pool{ - New: func() interface{} { + New: func() any { return &bytes.Buffer{} }, } @@ -40,7 +40,7 @@ func writeQuotedString(w io.Writer, s string) (int, error) { start := 0 for i := 0; i < len(s); { if b := s[i]; b < utf8.RuneSelf { - if 0x20 <= b && b != '\\' && b != '"' { + if 0x20 <= b && b != '\\' && b != '"' && b != 0x7f { i++ continue } @@ -91,14 +91,14 @@ func writeQuotedString(w io.Writer, s string) (int, error) { return n, err } -// NOTE: keep in sync with writeQuoteString above. +// NOTE: keep in sync with writeQuotedString above. func writeQuotedBytes(w io.Writer, s []byte) (int, error) { buf := getBuffer() buf.WriteByte('"') start := 0 for i := 0; i < len(s); { if b := s[i]; b < utf8.RuneSelf { - if 0x20 <= b && b != '\\' && b != '"' { + if 0x20 <= b && b != '\\' && b != '"' && b != 0x7f { i++ continue } diff --git a/vendor/modules.txt b/vendor/modules.txt index 4a2f2a21..a47bae66 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -13,8 +13,8 @@ github.com/charmbracelet/colorprofile # github.com/charmbracelet/lipgloss v1.1.0 ## explicit; go 1.18 github.com/charmbracelet/lipgloss -# github.com/charmbracelet/log v0.4.2 -## explicit; go 1.19 +# github.com/charmbracelet/log v1.0.0 +## explicit; go 1.21 github.com/charmbracelet/log # github.com/charmbracelet/x/ansi v0.11.6 ## explicit; go 1.24.2 @@ -59,8 +59,8 @@ github.com/gemaraproj/go-gemara github.com/gemaraproj/go-gemara/gemaraconv github.com/gemaraproj/go-gemara/internal/loaders github.com/gemaraproj/go-gemara/internal/oscal -# github.com/go-logfmt/logfmt v0.6.0 -## explicit; go 1.17 +# github.com/go-logfmt/logfmt v0.6.1 +## explicit; go 1.21 github.com/go-logfmt/logfmt # github.com/goccy/go-yaml v1.19.2 ## explicit; go 1.21.0