From 5511d6bc0530cbf7af9c517caa26c339729426b3 Mon Sep 17 00:00:00 2001 From: Yanchen Chen Date: Sun, 22 Feb 2026 01:27:09 +0800 Subject: [PATCH] Clean up unused ctx param, stale TODO, and unnamed error results - Remove unused context.Context parameter from generate() - Default unnamed error return values to "err" instead of "resultN" - Remove stale TODO comment for already-implemented directory creation --- cmd/breaker-cli/main.go | 13 ++++++++----- cmd/breaker-cli/template_validation_test.go | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/cmd/breaker-cli/main.go b/cmd/breaker-cli/main.go index 7bd0acc..8527047 100644 --- a/cmd/breaker-cli/main.go +++ b/cmd/breaker-cli/main.go @@ -2,7 +2,6 @@ package main import ( "bytes" - "context" "flag" "fmt" "go/types" @@ -76,7 +75,7 @@ func main() { Structs: []Struct{implementation}, } - reader, err := generate(context.Background(), pkg, *output) + reader, err := generate(pkg, *output) if err != nil { slog.Error("generate code", slog.Any("error", err)) os.Exit(1) @@ -84,7 +83,6 @@ func main() { writer := os.Stdout if *output != "" { - // TODO: Create the output directory if it does not exist. if dir := filepath.Dir(*output); dir != "." { if err = os.MkdirAll(dir, os.ModePerm); err != nil { slog.Error("create output directory", slog.Any("error", err), slog.String("path", dir)) @@ -131,7 +129,12 @@ func extractResults(tuple *types.Tuple, qualifier types.Qualifier) []Param { v := tuple.At(i) name := v.Name() if name == "" { - name = fmt.Sprintf("result%d", i) + typ := types.TypeString(v.Type(), qualifier) + if typ == "error" { + name = "err" + } else { + name = fmt.Sprintf("result%d", i) + } } results = append(results, Param{ Name: name, @@ -149,7 +152,7 @@ func parseBreakerTemplate() (*template.Template, error) { return tmpl, nil } -func generate(ctx context.Context, pkg Package, filename string) (io.Reader, error) { +func generate(pkg Package, filename string) (io.Reader, error) { tmpl, err := parseBreakerTemplate() if err != nil { return nil, err diff --git a/cmd/breaker-cli/template_validation_test.go b/cmd/breaker-cli/template_validation_test.go index 18da2b1..e5a628a 100644 --- a/cmd/breaker-cli/template_validation_test.go +++ b/cmd/breaker-cli/template_validation_test.go @@ -46,7 +46,7 @@ func TestTemplateValidationPipeline(t *testing.T) { }) t.Run("generate_and_go_fix", func(t *testing.T) { - reader, err := generate(context.Background(), pkg, output) + reader, err := generate(pkg, output) if err != nil { t.Fatalf("generate: %v", err) }