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 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
|
From: Simon Josefsson <simon@josefsson.org>
Date: Tue, 11 Feb 2025 20:35:01 +0100
Subject: [PATCH] Use stdlib json instead of goccy.
Forwarded: not-needed
---
internal/json/json.go | 51 ------------------------------------
internal/json/json_stdlib.go | 3 ---
2 files changed, 54 deletions(-)
delete mode 100644 internal/json/json.go
diff --git a/internal/json/json.go b/internal/json/json.go
deleted file mode 100644
index b4c4c9f..0000000
--- a/internal/json/json.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements. See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership. The ASF licenses this file
-// to you 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.
-
-//go:build !tinygo && !arrow_json_stdlib
-// +build !tinygo,!arrow_json_stdlib
-
-package json
-
-import (
- "io"
-
- "github.com/goccy/go-json"
-)
-
-type Decoder = json.Decoder
-type Encoder = json.Encoder
-type Marshaler = json.Marshaler
-type Delim = json.Delim
-type UnmarshalTypeError = json.UnmarshalTypeError
-type Number = json.Number
-type Unmarshaler = json.Unmarshaler
-type RawMessage = json.RawMessage
-
-func Marshal(v interface{}) ([]byte, error) {
- return json.Marshal(v)
-}
-
-func Unmarshal(data []byte, v interface{}) error {
- return json.Unmarshal(data, v)
-}
-
-func NewDecoder(r io.Reader) *Decoder {
- return json.NewDecoder(r)
-}
-
-func NewEncoder(w io.Writer) *Encoder {
- return json.NewEncoder(w)
-}
diff --git a/internal/json/json_stdlib.go b/internal/json/json_stdlib.go
index 3031029..295fadb 100644
--- a/internal/json/json_stdlib.go
+++ b/internal/json/json_stdlib.go
@@ -14,9 +14,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-//go:build tinygo || arrow_json_stdlib
-// +build tinygo arrow_json_stdlib
-
package json
import (
--
2.48.1
|