Skip to content

Commit

Permalink
make compatible with go 1.19
Browse files Browse the repository at this point in the history
  • Loading branch information
neolynx committed Jun 17, 2024
1 parent 7e8f254 commit 0c32ca5
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
20 changes: 15 additions & 5 deletions deb/reflist.go
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,10 @@ func bucketRefPrefix(ref []byte) []byte {
ref = ref[len(libPrefix):]
}

prefixLen := min(maxPrefixLen, len(ref))
prefixLen := len(ref)

Check failure on line 431 in deb/reflist.go

View workflow job for this annotation

GitHub Actions / lint

File is not `gofmt`-ed with `-s` (gofmt)
if maxPrefixLen < prefixLen {
prefixLen = maxPrefixLen
}
prefix, _, _ := bytes.Cut(ref[:prefixLen], []byte{' '})
return prefix
}
Expand Down Expand Up @@ -715,9 +718,16 @@ func (set *RefListDigestSet) ForEach(handler func(digest []byte) error) error {
return nil
}

// workaround for: conversion of slices to arrays requires go1.20 or later
func NewRefListArray(digest []byte) reflistDigestArray {

Check warning on line 722 in deb/reflist.go

View workflow job for this annotation

GitHub Actions / lint

unexported-return: exported func NewRefListArray returns unexported type deb.reflistDigestArray, which can be annoying to use (revive)
var array reflistDigestArray
copy(array[:], digest)
return array
}

// Add adds digest to set, doing nothing if the digest was already present
func (set *RefListDigestSet) Add(digest []byte) {
set.items[reflistDigestArray(digest)] = struct{}{}
set.items[NewRefListArray(digest)] = struct{}{}
}

// AddAllInRefList adds all the bucket digests in a SplitRefList to the set
Expand All @@ -731,13 +741,13 @@ func (set *RefListDigestSet) AddAllInRefList(sl *SplitRefList) {

// Has checks whether a digest is part of set
func (set *RefListDigestSet) Has(digest []byte) bool {
_, ok := set.items[reflistDigestArray(digest)]
_, ok := set.items[NewRefListArray(digest)]
return ok
}

// Remove removes a digest from set
func (set *RefListDigestSet) Remove(digest []byte) {
delete(set.items, reflistDigestArray(digest))
delete(set.items,NewRefListArray(digest))
}

// RemoveAll removes all the digests in other from the current set
Expand Down Expand Up @@ -861,7 +871,7 @@ func (collection *RefListCollection) loadBuckets(sl *SplitRefList) error {
var bucket *PackageRefList

if digest := sl.Buckets[idx]; len(digest) > 0 {
cacheKey := reflistDigestArray(digest)
cacheKey :=NewRefListArray(digest)
bucket = collection.cache[cacheKey]
if bucket == nil {
bucket = NewPackageRefList()
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/aptly-dev/aptly

go 1.21
go 1.19

require (
github.com/AlekSi/pointer v1.2.0
Expand Down

0 comments on commit 0c32ca5

Please sign in to comment.