Explorar o código

Merge pull request #44205 from thaJeztah/remove_deprecated_stubs

Remove stubs for deprecated functions and consts
Sebastiaan van Stijn %!s(int64=2) %!d(string=hai) anos
pai
achega
db1663a1e5
Modificáronse 3 ficheiros con 0 adicións e 104 borrados
  1. 0 14
      api/types/deprecated.go
  2. 0 55
      pkg/signal/signal_deprecated.go
  3. 0 35
      pkg/system/filesys_deprecated.go

+ 0 - 14
api/types/deprecated.go

@@ -1,14 +0,0 @@
-package types // import "github.com/docker/docker/api/types"
-
-import "github.com/docker/docker/api/types/volume"
-
-// Volume volume
-//
-// Deprecated: use github.com/docker/docker/api/types/volume.Volume
-type Volume = volume.Volume
-
-// VolumeUsageData Usage details about the volume. This information is used by the
-// `GET /system/df` endpoint, and omitted in other endpoints.
-//
-// Deprecated: use github.com/docker/docker/api/types/volume.UsageData
-type VolumeUsageData = volume.UsageData

+ 0 - 55
pkg/signal/signal_deprecated.go

@@ -1,55 +0,0 @@
-// Package signal provides helper functions for dealing with signals across
-// various operating systems.
-package signal // import "github.com/docker/docker/pkg/signal"
-
-import (
-	"github.com/docker/docker/pkg/stack"
-	msignal "github.com/moby/sys/signal"
-)
-
-var (
-	// DumpStacks appends the runtime stack into file in dir and returns full path
-	// to that file.
-	// Deprecated: use github.com/docker/docker/pkg/stack.Dump instead.
-	DumpStacks = stack.DumpToFile
-
-	// CatchAll catches all signals and relays them to the specified channel.
-	// SIGURG is not handled, as it's used by the Go runtime to support
-	// preemptable system calls.
-	// Deprecated: use github.com/moby/sys/signal.CatchAll instead
-	CatchAll = msignal.CatchAll
-
-	// StopCatch stops catching the signals and closes the specified channel.
-	// Deprecated: use github.com/moby/sys/signal.StopCatch instead
-	StopCatch = msignal.StopCatch
-
-	// ParseSignal translates a string to a valid syscall signal.
-	// It returns an error if the signal map doesn't include the given signal.
-	// Deprecated: use github.com/moby/sys/signal.ParseSignal instead
-	ParseSignal = msignal.ParseSignal
-
-	// ValidSignalForPlatform returns true if a signal is valid on the platform
-	// Deprecated: use github.com/moby/sys/signal.ValidSignalForPlatform instead
-	ValidSignalForPlatform = msignal.ValidSignalForPlatform
-
-	// SignalMap is a map of signals for the current platform.
-	// Deprecated: use github.com/moby/sys/signal.SignalMap instead
-	SignalMap = msignal.SignalMap
-)
-
-// Signals used in cli/command
-const (
-	// SIGCHLD is a signal sent to a process when a child process terminates, is interrupted, or resumes after being interrupted.
-	// Deprecated: use github.com/moby/sys/signal.SIGCHLD instead
-	SIGCHLD = msignal.SIGCHLD
-	// SIGWINCH is a signal sent to a process when its controlling terminal changes its size
-	// Deprecated: use github.com/moby/sys/signal.SIGWINCH instead
-	SIGWINCH = msignal.SIGWINCH
-	// SIGPIPE is a signal sent to a process when a pipe is written to before the other end is open for reading
-	// Deprecated: use github.com/moby/sys/signal.SIGPIPE instead
-	SIGPIPE = msignal.SIGPIPE
-
-	// DefaultStopSignal has been deprecated and removed. The default value is
-	// now defined in github.com/docker/docker/container. Clients should omit
-	// the container's stop-signal field if the default should be used.
-)

+ 0 - 35
pkg/system/filesys_deprecated.go

@@ -1,35 +0,0 @@
-package system
-
-import (
-	"os"
-
-	"github.com/moby/sys/sequential"
-)
-
-// CreateSequential is deprecated.
-//
-// Deprecated: use os.Create or github.com/moby/sys/sequential.Create()
-func CreateSequential(name string) (*os.File, error) {
-	return sequential.Create(name)
-}
-
-// OpenSequential is deprecated.
-//
-// Deprecated: use os.Open or github.com/moby/sys/sequential.Open
-func OpenSequential(name string) (*os.File, error) {
-	return sequential.Open(name)
-}
-
-// OpenFileSequential is deprecated.
-//
-// Deprecated: use github.com/moby/sys/sequential.OpenFile()
-func OpenFileSequential(name string, flag int, perm os.FileMode) (*os.File, error) {
-	return sequential.OpenFile(name, flag, perm)
-}
-
-// TempFileSequential is deprecated.
-//
-// Deprecated: use os.CreateTemp or github.com/moby/sys/sequential.CreateTemp
-func TempFileSequential(dir, prefix string) (f *os.File, err error) {
-	return sequential.CreateTemp(dir, prefix)
-}