1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
|
From: Mathias Gibbens <gibmat@debian.org>
Description: Always use encoding/json rather than goccy/go-json, as that package doesn't build on s390x
Forwarded: https://github.com/goccy/go-json/issues/466
diff --git a/internal/json/json_goccy.go b/internal/json/json_goccy.go
deleted file mode 100644
index 8fc3384..0000000
--- a/internal/json/json_goccy.go
+++ /dev/null
@@ -1,49 +0,0 @@
-//go:build !stdlibjson
-
-/*
- * MinIO Go Library for Amazon S3 Compatible Cloud Storage
- * Copyright 2025 MinIO, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package json
-
-import "github.com/goccy/go-json"
-
-// This file defines the JSON functions used internally and forwards them
-// to goccy/go-json. Alternatively, the standard library can be used by setting
-// the build tag stdlibjson. This can be useful for testing purposes or if
-// goccy/go-json causes issues.
-//
-// This file does not contain all definitions from goccy/go-json; if needed, more
-// can be added, but keep in mind that json_stdlib.go will also need to be
-// updated.
-
-var (
- // Unmarshal is a wrapper around goccy/go-json Unmarshal function.
- Unmarshal = json.Unmarshal
- // Marshal is a wrapper around goccy/go-json Marshal function.
- Marshal = json.Marshal
- // NewEncoder is a wrapper around goccy/go-json NewEncoder function.
- NewEncoder = json.NewEncoder
- // NewDecoder is a wrapper around goccy/go-json NewDecoder function.
- NewDecoder = json.NewDecoder
-)
-
-type (
- // Encoder is an alias for goccy/go-json Encoder.
- Encoder = json.Encoder
- // Decoder is an alias for goccy/go-json Decoder.
- Decoder = json.Decoder
-)
diff --git a/internal/json/json_stdlib.go b/internal/json/json_stdlib.go
index a671fea..dc448c0 100644
--- a/internal/json/json_stdlib.go
+++ b/internal/json/json_stdlib.go
@@ -1,5 +1,3 @@
-//go:build stdlibjson
-
/*
* MinIO Go Library for Amazon S3 Compatible Cloud Storage
* Copyright 2025 MinIO, Inc.
|