From b43377a38b054cc5e4674181622bdb83576b83c1 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 20 Jan 2024 21:38:23 +0100 Subject: [PATCH] cli/command: remove deprecated DockerCliOption, InitializeOpt These types were deprecated in 7af509c7f12e2a541aedb9f26ec3e498c64eee8f (v25.0), in favor of CLIOption, and are no longer used. This patch removes the deprecated type-aliases, and while updating, also improves the documentation for the CLIOption type. Signed-off-by: Sebastiaan van Stijn --- cli/command/cli_options.go | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/cli/command/cli_options.go b/cli/command/cli_options.go index 858155b635..8e431bf865 100644 --- a/cli/command/cli_options.go +++ b/cli/command/cli_options.go @@ -11,19 +11,11 @@ import ( "github.com/moby/term" ) -// CLIOption applies a modification on a DockerCli. +// CLIOption is a functional argument to apply options to a [DockerCli]. These +// options can be passed to [NewDockerCli] to initialize a new CLI, or +// applied with [DockerCli.Initialize] or [DockerCli.Apply]. type CLIOption func(cli *DockerCli) error -// DockerCliOption applies a modification on a DockerCli. -// -// Deprecated: use [CLIOption] instead. -type DockerCliOption = CLIOption - -// InitializeOpt is the type of the functional options passed to DockerCli.Initialize -// -// Deprecated: use [CLIOption] instead. -type InitializeOpt = CLIOption - // WithStandardStreams sets a cli in, out and err streams with the standard streams. func WithStandardStreams() CLIOption { return func(cli *DockerCli) error {