summaryrefslogtreecommitdiffstats
path: root/vendor/github.com/google/gops/internal
diff options
context:
space:
mode:
authorWim <wim@42.be>2022-08-13 16:14:26 +0200
committerGitHub <noreply@github.com>2022-08-13 16:14:26 +0200
commit6a3fc713978a0c1c9290a4afd08b47886b49b635 (patch)
treeaa62cd85cf5671646c75ee38b3fc140ef7edcea8 /vendor/github.com/google/gops/internal
parent3c4192ebf6a32e30cdd23a9644c2ceca72a006fa (diff)
downloadmatterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.tar.gz
matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.tar.bz2
matterbridge-msglm-6a3fc713978a0c1c9290a4afd08b47886b49b635.zip
Update dependencies and go1.18 (#1873)
* Update dependencies and go1.18 * Exclude unnecessary linters and update build to go1.18
Diffstat (limited to 'vendor/github.com/google/gops/internal')
-rw-r--r--vendor/github.com/google/gops/internal/internal.go4
-rw-r--r--vendor/github.com/google/gops/internal/internal_go1_13.go20
-rw-r--r--vendor/github.com/google/gops/internal/internal_lt_go1_13.go12
3 files changed, 2 insertions, 34 deletions
diff --git a/vendor/github.com/google/gops/internal/internal.go b/vendor/github.com/google/gops/internal/internal.go
index ec63f918..7fc162a6 100644
--- a/vendor/github.com/google/gops/internal/internal.go
+++ b/vendor/github.com/google/gops/internal/internal.go
@@ -22,8 +22,8 @@ func ConfigDir() (string, error) {
return configDir, nil
}
- if osUserConfigDir := getOSUserConfigDir(); osUserConfigDir != "" {
- return filepath.Join(osUserConfigDir, "gops"), nil
+ if userConfigDir, err := os.UserConfigDir(); err == nil {
+ return filepath.Join(userConfigDir, "gops"), nil
}
if runtime.GOOS == "windows" {
diff --git a/vendor/github.com/google/gops/internal/internal_go1_13.go b/vendor/github.com/google/gops/internal/internal_go1_13.go
deleted file mode 100644
index 252f7969..00000000
--- a/vendor/github.com/google/gops/internal/internal_go1_13.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build go1.13
-// +build go1.13
-
-package internal
-
-import (
- "os"
-)
-
-func getOSUserConfigDir() string {
- configDir, err := os.UserConfigDir()
- if err != nil {
- return ""
- }
- return configDir
-}
diff --git a/vendor/github.com/google/gops/internal/internal_lt_go1_13.go b/vendor/github.com/google/gops/internal/internal_lt_go1_13.go
deleted file mode 100644
index e1bb00e9..00000000
--- a/vendor/github.com/google/gops/internal/internal_lt_go1_13.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2020 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:build !go1.13
-// +build !go1.13
-
-package internal
-
-func getOSUserConfigDir() string {
- return ""
-}