From 1adf32a3fd403557db569c0c5418364c5caeaac0 Mon Sep 17 00:00:00 2001 From: xrstf Date: Fri, 5 Jan 2024 19:30:22 +0100 Subject: [PATCH] cleanup code --- cmd/rudi/encoding/decode.go | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/cmd/rudi/encoding/decode.go b/cmd/rudi/encoding/decode.go index c140e08..d1d7cfe 100644 --- a/cmd/rudi/encoding/decode.go +++ b/cmd/rudi/encoding/decode.go @@ -63,7 +63,7 @@ func Decode(input io.Reader, enc types.Encoding) (any, error) { case types.YamlEncoding: decoded, err := decodeYaml(input) if err != nil { - return nil, fmt.Errorf("failed to parse file as JSON5: %w", err) + return nil, err } switch len(decoded) { @@ -76,23 +76,12 @@ func Decode(input io.Reader, enc types.Encoding) (any, error) { } case types.YamlDocumentsEncoding: - decoder := yaml.NewDecoder(input) - - documents := []any{} - for { - var doc any - if err := decoder.Decode(&doc); err != nil { - if errors.Is(err, io.EOF) { - break - } - - return nil, fmt.Errorf("failed to parse file as YAML: %w", err) - } - - documents = append(documents, doc) + decoded, err := decodeYaml(input) + if err != nil { + return nil, err } - data = documents + data = decoded case types.TomlEncoding: decoder := toml.NewDecoder(input)