Merge pull request moby#47130 from thaJeztah/pkg_homedir_deprecated

pkg/homedir: remove deprecated Key() and GetShortcutString()
runpod · Jan 22, 2024 · 5ad5334 · 5ad5334
2 parents 4178263 + 2767d9b
commit 5ad5334
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 37 deletions.
diff --git 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
@@ -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
diff --git a/pkg/homedir/homedir_windows.go b/pkg/homedir/homedir_windows.go