From 08a0ecd883b5f37c09b79143de17e596416b8ce8 Mon Sep 17 00:00:00 2001 From: "F." Date: Tue, 10 Jun 2025 08:30:41 +0200 Subject: [PATCH] git commit -m "refactor: flatten package structure and update Go to 1.24.4 - Move all files from pkg/ewrap/ to root directory for simpler import paths - Update import paths from github.com/hyp3rd/ewrap/pkg/ewrap to github.com/hyp3rd/ewrap - Update import paths for adapters to github.com/hyp3rd/ewrap/adapters - Bump Go version from 1.24.3 to 1.24.4 in go.mod and .golangci.yaml - Add --fix and -v flags to golangci-lint command in Makefile - Update all example code and tests to use new import paths BREAKING CHANGE: Import paths have changed - users need to update imports from 'github.com/hyp3rd/ewrap/pkg/ewrap' to 'github.com/hyp3rd/ewrap'" --- .golangci.yaml | 2 +- Makefile | 2 +- __examples/main.go | 4 ++-- pkg/ewrap/context.go => context.go | 0 docs/docs/examples/basic.md | 2 +- pkg/ewrap/error_group.go => error_group.go | 0 pkg/ewrap/error_group_test.go => error_group_test.go | 0 pkg/ewrap/errors.go => errors.go | 0 pkg/ewrap/errrors_test.go => errrors_test.go | 0 pkg/ewrap/format.go => format.go | 0 go.mod | 2 +- pkg/ewrap/retry.go => retry.go | 0 pkg/ewrap/retry_test.go => retry_test.go | 0 test/benchmark_test.go | 2 +- test/comparison_benchmark_test.go | 2 +- test/profile_test.go | 2 +- pkg/ewrap/threshold.go => threshold.go | 0 pkg/ewrap/types.go => types.go | 0 18 files changed, 9 insertions(+), 9 deletions(-) rename pkg/ewrap/context.go => context.go (100%) rename pkg/ewrap/error_group.go => error_group.go (100%) rename pkg/ewrap/error_group_test.go => error_group_test.go (100%) rename pkg/ewrap/errors.go => errors.go (100%) rename pkg/ewrap/errrors_test.go => errrors_test.go (100%) rename pkg/ewrap/format.go => format.go (100%) rename pkg/ewrap/retry.go => retry.go (100%) rename pkg/ewrap/retry_test.go => retry_test.go (100%) rename pkg/ewrap/threshold.go => threshold.go (100%) rename pkg/ewrap/types.go => types.go (100%) diff --git a/.golangci.yaml b/.golangci.yaml index f3b7909..239dcfe 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -42,7 +42,7 @@ run: # Define the Go version limit. # Mainly related to generics support since go1.18. # Default: use Go version from the go.mod file, fallback on the env var `GOVERSION`, fallback on 1.17 - go: "1.24.3" + go: "1.24.4" exclusions: # Which file paths to exclude: they will be analyzed, but issues from them won't be reported. diff --git a/Makefile b/Makefile index 5ee56cd..391d30c 100644 --- a/Makefile +++ b/Makefile @@ -67,7 +67,7 @@ lint: prepare-toolchain staticcheck ./... @echo "\nRunning golangci-lint $(GOLANGCI_LINT_VERSION)..." - golangci-lint run ./...... + golangci-lint run --fix -v ./...... # check_command_exists is a helper function that checks if a command exists. define check_command_exists diff --git a/__examples/main.go b/__examples/main.go index 2e663d8..ee9c3aa 100644 --- a/__examples/main.go +++ b/__examples/main.go @@ -10,8 +10,8 @@ import ( "github.com/sirupsen/logrus" "go.uber.org/zap" - "github.com/hyp3rd/ewrap/pkg/ewrap" - "github.com/hyp3rd/ewrap/pkg/ewrap/adapters" + "github.com/hyp3rd/ewrap" + "github.com/hyp3rd/ewrap/adapters" ) func main() { diff --git a/pkg/ewrap/context.go b/context.go similarity index 100% rename from pkg/ewrap/context.go rename to context.go diff --git a/docs/docs/examples/basic.md b/docs/docs/examples/basic.md index 998649e..6a2d797 100644 --- a/docs/docs/examples/basic.md +++ b/docs/docs/examples/basic.md @@ -13,7 +13,7 @@ import ( "context" "fmt" - "github.com/hyp3rd/ewrap/pkg/ewrap" + "github.com/hyp3rd/ewrap" ) func main() { diff --git a/pkg/ewrap/error_group.go b/error_group.go similarity index 100% rename from pkg/ewrap/error_group.go rename to error_group.go diff --git a/pkg/ewrap/error_group_test.go b/error_group_test.go similarity index 100% rename from pkg/ewrap/error_group_test.go rename to error_group_test.go diff --git a/pkg/ewrap/errors.go b/errors.go similarity index 100% rename from pkg/ewrap/errors.go rename to errors.go diff --git a/pkg/ewrap/errrors_test.go b/errrors_test.go similarity index 100% rename from pkg/ewrap/errrors_test.go rename to errrors_test.go diff --git a/pkg/ewrap/format.go b/format.go similarity index 100% rename from pkg/ewrap/format.go rename to format.go diff --git a/go.mod b/go.mod index a6ac9f2..60f0cc8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/hyp3rd/ewrap -go 1.24.3 +go 1.24.4 require ( emperror.dev/emperror v0.33.0 diff --git a/pkg/ewrap/retry.go b/retry.go similarity index 100% rename from pkg/ewrap/retry.go rename to retry.go diff --git a/pkg/ewrap/retry_test.go b/retry_test.go similarity index 100% rename from pkg/ewrap/retry_test.go rename to retry_test.go diff --git a/test/benchmark_test.go b/test/benchmark_test.go index f220d7a..bf405ee 100644 --- a/test/benchmark_test.go +++ b/test/benchmark_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hyp3rd/ewrap/pkg/ewrap" + "github.com/hyp3rd/ewrap" ) // mockLogger implements a minimal logger for benchmarking diff --git a/test/comparison_benchmark_test.go b/test/comparison_benchmark_test.go index bb459e7..80c0429 100644 --- a/test/comparison_benchmark_test.go +++ b/test/comparison_benchmark_test.go @@ -9,7 +9,7 @@ import ( "github.com/hashicorp/go-multierror" "go.uber.org/multierr" - "github.com/hyp3rd/ewrap/pkg/ewrap" + "github.com/hyp3rd/ewrap" ) // This test suite compares our implementation against popular error handling libraries diff --git a/test/profile_test.go b/test/profile_test.go index 662d55c..b8b99ab 100644 --- a/test/profile_test.go +++ b/test/profile_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/hyp3rd/ewrap/pkg/ewrap" + "github.com/hyp3rd/ewrap" ) // TestProfileErrorOperations runs a comprehensive profiling suite for error operations. diff --git a/pkg/ewrap/threshold.go b/threshold.go similarity index 100% rename from pkg/ewrap/threshold.go rename to threshold.go diff --git a/pkg/ewrap/types.go b/types.go similarity index 100% rename from pkg/ewrap/types.go rename to types.go