From 2767d9ba0515b0a803207852f6476a31e8e93a46 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Sat, 20 Jan 2024 01:11:44 +0100
Subject: [PATCH] pkg/homedir: remove deprecated Key() and GetShortcutString()

These were deprecated in ddd9665289fae5f2f62343d9355e9d5e1b97a2d8 (v25.0),
and 3c1de2e667f4ff99e2f05993e9fb5e66b1c77b68, and are no longer used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 pkg/homedir/homedir.go         | 16 ----------------
 pkg/homedir/homedir_test.go    |  7 -------
 pkg/homedir/homedir_unix.go    |  8 --------
 pkg/homedir/homedir_windows.go |  6 ------
 4 files changed, 37 deletions(-)
 delete mode 100644 pkg/homedir/homedir_unix.go
 delete mode 100644 pkg/homedir/homedir_windows.go

diff --git a/pkg/homedir/homedir.go b/pkg/homedir/homedir.go
index 590683206c..c0ab3f5bf3 100644
--- a/pkg/homedir/homedir.go
+++ b/pkg/homedir/homedir.go
@@ -6,14 +6,6 @@ import (
 	"runtime"
 )
 
-// Key returns the env var name for the user's home dir based on
-// the platform being run on.
-//
-// Deprecated: this function is no longer used, and will be removed in the next release.
-func Key() string {
-	return envKeyName
-}
-
 // Get returns the home directory of the current user with the help of
 // environment variables depending on the target operating system.
 // Returned path should be used with "path/filepath" to form new paths.
@@ -34,11 +26,3 @@ func Get() string {
 	}
 	return home
 }
-
-// GetShortcutString returns the string that is shortcut to user's home directory
-// in the native shell of the platform running on.
-//
-// Deprecated: this function is no longer used, and will be removed in the next release.
-func GetShortcutString() string {
-	return homeShortCut
-}
diff --git a/pkg/homedir/homedir_test.go b/pkg/homedir/homedir_test.go
index d0ed55b7e2..6f44a4609a 100644
--- a/pkg/homedir/homedir_test.go
+++ b/pkg/homedir/homedir_test.go
@@ -15,10 +15,3 @@ func TestGet(t *testing.T) {
 		t.Fatalf("returned path is not absolute: %s", home)
 	}
 }
-
-func TestGetShortcutString(t *testing.T) {
-	shortcut := GetShortcutString() //nolint:staticcheck // ignore SA1019 (GetShortcutString is deprecated)
-	if shortcut == "" {
-		t.Fatal("returned shortcut string is empty")
-	}
-}
diff --git a/pkg/homedir/homedir_unix.go b/pkg/homedir/homedir_unix.go
deleted file mode 100644
index feae4d736c..0000000000
--- a/pkg/homedir/homedir_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-//go:build !windows
-
-package homedir // import "github.com/docker/docker/pkg/homedir"
-
-const (
-	envKeyName   = "HOME"
-	homeShortCut = "~"
-)
diff --git a/pkg/homedir/homedir_windows.go b/pkg/homedir/homedir_windows.go
deleted file mode 100644
index 37f4ee6701..0000000000
--- a/pkg/homedir/homedir_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package homedir // import "github.com/docker/docker/pkg/homedir"
-
-const (
-	envKeyName   = "USERPROFILE"
-	homeShortCut = "%USERPROFILE%" // be careful while using in format functions
-)