util/compression: move type definition together with implementation

Signed-off-by: Sebastiaan van Stijn <[email protected]>
moby · Sep 24, 2024 · ceda214 · ceda214
1 parent 8a26ca7
commit ceda214
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/util/compression/compression.go b/util/compression/compression.go
@@ -32,13 +32,6 @@ type Type interface {
 	String() string
 }
 
-type (
-	uncompressedType struct{}
-	gzipType         struct{}
-	estargzType      struct{}
-	zstdType         struct{}
-)
-
 var (
 	// Uncompressed indicates no compression.
 	Uncompressed = uncompressedType{}

diff --git a/util/compression/estargz.go b/util/compression/estargz.go
@@ -24,6 +24,8 @@ var EStargzAnnotations = []string{estargz.TOCJSONDigestAnnotation, estargz.Store
 
 const estargzLabel = "buildkit.io/compression/estargz"
 
+type estargzType struct{}
+
 func (c estargzType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	var cInfo *compressionInfo
 	var writeErr error

diff --git a/util/compression/gzip.go b/util/compression/gzip.go
@@ -10,6 +10,8 @@ import (
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+type gzipType struct{}
+
 func (c gzipType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	return func(dest io.Writer, _ string) (io.WriteCloser, error) {
 		return gzipWriter(comp)(dest)

diff --git a/util/compression/nydus.go b/util/compression/nydus.go
@@ -17,8 +17,6 @@ import (
 	nydusify "github.com/containerd/nydus-snapshotter/pkg/converter"
 )
 
-type nydusType struct{}
-
 var Nydus = nydusType{}
 
 func init() {
@@ -28,6 +26,8 @@ func init() {
 	toCompressionType[Nydus.String()] = Nydus
 }
 
+type nydusType struct{}
+
 func (c nydusType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	digester := digest.Canonical.Digester()
 	return func(dest io.Writer, requiredMediaType string) (io.WriteCloser, error) {

diff --git a/util/compression/uncompressed.go b/util/compression/uncompressed.go
@@ -10,6 +10,8 @@ import (
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+type uncompressedType struct{}
+
 func (c uncompressedType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	return func(dest io.Writer, mediaType string) (io.WriteCloser, error) {
 		return &iohelper.NopWriteCloser{Writer: dest}, nil

diff --git a/util/compression/zstd.go b/util/compression/zstd.go
@@ -10,6 +10,8 @@ import (
 	ocispecs "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
+type zstdType struct{}
+
 func (c zstdType) Compress(ctx context.Context, comp Config) (compressorFunc Compressor, finalize Finalizer) {
 	return func(dest io.Writer, _ string) (io.WriteCloser, error) {
 		return zstdWriter(comp)(dest)