os: use stringslite.TrimSuffix

Change-Id: Ie51a1550181c9478455c757fc82a88bc549ad687
GitHub-Last-Rev: 4b6ffd043b0f2acebb8d2477da17a4d1dfe708ed
GitHub-Pull-Request: golang/go#67153
Reviewed-on: https://go-review.googlesource.com/c/go/+/583095
Auto-Submit: Ian Lance Taylor <iant@google.com>
Commit-Queue: Ian Lance Taylor <iant@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
Auto-Submit: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Reviewed-by: Keith Randall <khr@google.com>
Reviewed-by: Ian Lance Taylor <iant@google.com>

diff --git a/src/os/executable_procfs.go b/src/os/executable_procfs.go
index 94e674e364867494b631a5f9de3e85680716e354..6a2cd10be7c402349784b9779a11869d7f558919 100644 (file)
--- a/src/os/executable_procfs.go
+++ b/src/os/executable_procfs.go
@@ -8,6 +8,7 @@ package os
 
 import (
        "errors"
+       "internal/stringslite"
        "runtime"
 )
 
@@ -25,13 +26,5 @@ func executable() (string, error) {
 
        // When the executable has been deleted then Readlink returns a
        // path appended with " (deleted)".
-       return stringsTrimSuffix(path, " (deleted)"), err
-}
-
-// stringsTrimSuffix is the same as strings.TrimSuffix.
-func stringsTrimSuffix(s, suffix string) string {
-       if len(s) >= len(suffix) && s[len(s)-len(suffix):] == suffix {
-               return s[:len(s)-len(suffix)]
-       }
-       return s
+       return stringslite.TrimSuffix(path, " (deleted)"), err
 }