admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(settings): use github.com/qdm12/gosettings

Browse Source
This commit is contained in:
Quentin McGaw
2023-05-25 12:08:43 +00:00
parent 1827a03afd
commit a43973c093
31 changed files with 461 additions and 496 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internal/configuration/settings/helpers/merge.go
View File

@@ -30,7 +30,7 @@ func MergeWithNumber[T Number](existing, other T) (result T) { //nolint:ireturn
return other
}
func MergeWithIP(existing, other netip.Addr) (result netip.Addr) {
func MergeWithValidator(existing, other netip.Addr) (result netip.Addr) {
if existing.IsValid() {
return existing
}
@@ -44,7 +44,7 @@ func MergeWithHTTPHandler(existing, other http.Handler) (result http.Handler) {
return other
}
func MergeSlices[T comparable](a, b []T) (result []T) {
func MergeWithSlice[T comparable](a, b []T) (result []T) {
if a == nil && b == nil {
return nil
}