Merging upstream version 1.2.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 79 deletions

diff --git a/dependencies/pkg/mod/go.uber.org/zap@v1.25.0/encoder.go b/dependencies/pkg/mod/go.uber.org/zap@v1.25.0/encoder.go
deleted file mode 100644
index caa04ce..0000000
--- a/dependencies/pkg/mod/go.uber.org/zap@v1.25.0/encoder.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright (c) 2016 Uber Technologies, Inc.
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-// The above copyright notice and this permission notice shall be included in
-// all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-// THE SOFTWARE.
-
-package zap
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-
-	"go.uber.org/zap/zapcore"
-)
-
-var (
-	errNoEncoderNameSpecified = errors.New("no encoder name specified")
-
-	_encoderNameToConstructor = map[string]func(zapcore.EncoderConfig) (zapcore.Encoder, error){
-		"console": func(encoderConfig zapcore.EncoderConfig) (zapcore.Encoder, error) {
-			return zapcore.NewConsoleEncoder(encoderConfig), nil
-		},
-		"json": func(encoderConfig zapcore.EncoderConfig) (zapcore.Encoder, error) {
-			return zapcore.NewJSONEncoder(encoderConfig), nil
-		},
-	}
-	_encoderMutex sync.RWMutex
-)
-
-// RegisterEncoder registers an encoder constructor, which the Config struct
-// can then reference. By default, the "json" and "console" encoders are
-// registered.
-//
-// Attempting to register an encoder whose name is already taken returns an
-// error.
-func RegisterEncoder(name string, constructor func(zapcore.EncoderConfig) (zapcore.Encoder, error)) error {
-	_encoderMutex.Lock()
-	defer _encoderMutex.Unlock()
-	if name == "" {
-		return errNoEncoderNameSpecified
-	}
-	if _, ok := _encoderNameToConstructor[name]; ok {
-		return fmt.Errorf("encoder already registered for name %q", name)
-	}
-	_encoderNameToConstructor[name] = constructor
-	return nil
-}
-
-func newEncoder(name string, encoderConfig zapcore.EncoderConfig) (zapcore.Encoder, error) {
-	if encoderConfig.TimeKey != "" && encoderConfig.EncodeTime == nil {
-		return nil, errors.New("missing EncodeTime in EncoderConfig")
-	}
-
-	_encoderMutex.RLock()
-	defer _encoderMutex.RUnlock()
-	if name == "" {
-		return nil, errNoEncoderNameSpecified
-	}
-	constructor, ok := _encoderNameToConstructor[name]
-	if !ok {
-		return nil, fmt.Errorf("no encoder registered for name %q", name)
-	}
-	return constructor(encoderConfig)
-}