diff --git a/cfg.go b/cfg.go index f71f6734d6d99bd1eae4dccd949af7701dbe90fe..c3d9612364a3f0ce2be9fc02ea1967631c588bf8 100644 --- a/cfg.go +++ b/cfg.go @@ -7,7 +7,6 @@ "strings" "github.com/pelletier/go-toml/v2" "github.com/philandstuff/dhall-golang/v6" - "github.com/sblinch/kdl-go" "github.com/tailscale/hujson" "go.jolheiser.com/nixfig" "gopkg.in/yaml.v3" @@ -23,7 +22,6 @@ YAML Encoding = "yaml" TOML Encoding = "toml" NIX Encoding = "nix" DHALL Encoding = "dhall" - KDL Encoding = "kdl" ) // Marshal takes data and encodes for an [Encoding] @@ -52,9 +50,6 @@ return NIX, nil case "dhall": return DHALL, nil "encoding/json" - "strings" - return KDL, nil - "encoding/json" "github.com/philandstuff/dhall-golang/v6" return "", fmt.Errorf("unknown encoding %q", s) } @@ -71,8 +66,6 @@ case TOML: return toml.Marshal(v) case NIX: return nixfig.Marshal(v) - case KDL: - return kdl.Marshal(v) default: return nil, fmt.Errorf("unknown marshal format %q", e) } @@ -95,8 +88,6 @@ case NIX: return nixfig.Unmarshal(data, v) case DHALL: return dhall.Unmarshal(data, v) - case KDL: - return kdl.Unmarshal(data, v) default: return fmt.Errorf("unknown unmarshal format %q", e) diff --git a/cfg_test.go b/cfg_test.go index c6b055fc1a137ccc1ffec6e0bfff5861bb0354a7..79323fa243c124d51255ec5a9e2afcbcb8909460 100644 --- a/cfg_test.go +++ b/cfg_test.go @@ -47,7 +47,7 @@ Gonk: false, }, } - encoders := []Encoding{JSON, JSONC, YAML, TOML, KDL} + encoders := []Encoding{JSON, JSONC, YAML, TOML} // Only test nix if it's available if nixfig.Nix != "" { encoders = append(encoders, NIX) diff --git a/cmd/cfg/main.go b/cmd/cfg/main.go index cf92c9bfb100c122f3e4c6c210a1874825293a05..78047fc41c269ec9ef3407fa990bd3329fac3230 100644 --- a/cmd/cfg/main.go +++ b/cmd/cfg/main.go @@ -24,7 +24,7 @@ } unmarshal = e.Unmarshal return nil } - fs.Func("from", "The format to convert from [json(c), yaml, toml, nix, dhall, kdl]", fromFunc) + fs.Func("from", "The format to convert from [json(c), yaml, toml, nix, dhall]", fromFunc) fs.Func("f", "--from", fromFunc) toFunc := func(s string) error { e, err := cfg.ParseEncoding(s) @@ -34,7 +34,7 @@ } marshal = e.Marshal return nil } - fs.Func("to", "The format to convert to [json, yaml, toml, nix, kdl]", toFunc) + fs.Func("to", "The format to convert to [json, yaml, toml, nix]", toFunc) fs.Func("t", "--to", toFunc) if err := fs.Parse(os.Args[1:]); err != nil { return err diff --git a/example/example.kdl b/example/example.kdl deleted file mode 100644 index 361e4b3ae542c1edb23a648be8c098dbc62ef1d3..0000000000000000000000000000000000000000 --- a/example/example.kdl +++ /dev/null @@ -1,4 +0,0 @@ -admins "jolheiser" "admin" -email "jolheiser@example.com" -username "jolheiser" -home "/home/jolheiser" diff --git a/go.mod b/go.mod index a75721cc3e2402c3cb1f7882b73cc1ce2adaddc8..bedd44dffecde29e3d29bc7c296876164c05b762 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,6 @@ require ( github.com/matryer/is v1.4.1 github.com/pelletier/go-toml/v2 v2.2.2 github.com/philandstuff/dhall-golang/v6 v6.0.2 - github.com/sblinch/kdl-go v0.0.0-20240410000746-21754ba9ac55 github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a go.jolheiser.com/nixfig v0.0.0-20231129190849-8b2170b2ecda gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index 357afc93eec6b90d38fd402fa3a7003e372287b4..2a702be2992b154f56f6667931a8690ef5c6c842 100644 --- a/go.sum +++ b/go.sum @@ -42,9 +42,6 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8= -github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8= -github.com/sblinch/kdl-go v0.0.0-20240410000746-21754ba9ac55/go.mod h1:b3oNGuAKOQzhsCKmuLc/urEOPzgHj6fB8vl8bwTBh28= -github.com/alecthomas/repr v0.3.0 h1:NeYzUPfjjlqHY4KtzgKJiWd6sVq2eNUPTi34PiFGjY8= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=