Merge pull request #502 from happygiraffe/master

small cleanups

Author: lemire

.github/workflows/armtests.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/basictests.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/bigendiantests.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/legacytests.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [ubuntu-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/macostests.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:

.github/workflows/windowstests.yml

@@ -7,7 +7,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x]
+        go-version: [1.24.x]
         platform: [windows-latest]
     runs-on: ${{ matrix.platform }}
     steps:

iter.go

@@ -1,9 +1,11 @@
 package roaring
 
+import "iter"
+
 // Values returns an iterator that yields the elements of the bitmap in
 // increasing order. Starting with Go 1.23, users can use a for loop to iterate
 // over it.
-func Values(b *Bitmap) func(func(uint32) bool) {
+func Values(b *Bitmap) iter.Seq[uint32] {
 	return func(yield func(uint32) bool) {
 		it := b.Iterator()
 		for it.HasNext() {
@@ -17,7 +19,7 @@ func Values(b *Bitmap) func(func(uint32) bool) {
 // Backward returns an iterator that yields the elements of the bitmap in
 // decreasing order. Starting with Go 1.23, users can use a for loop to iterate
 // over it.
-func Backward(b *Bitmap) func(func(uint32) bool) {
+func Backward(b *Bitmap) iter.Seq[uint32] {
 	return func(yield func(uint32) bool) {
 		it := b.ReverseIterator()
 		for it.HasNext() {
@@ -30,7 +32,7 @@ func Backward(b *Bitmap) func(func(uint32) bool) {
 
 // Unset creates an iterator that yields values in the range [min, max] that are NOT contained in the bitmap.
 // The iterator becomes invalid if the bitmap is modified (e.g., with Add or Remove).
-func Unset(b *Bitmap, min, max uint32) func(func(uint32) bool) {
+func Unset(b *Bitmap, min, max uint32) iter.Seq[uint32] {
 	return func(yield func(uint32) bool) {
 		it := b.UnsetIterator(uint64(min), uint64(max)+1)
 		for it.HasNext() {

roaring64/bsi64_test.go

@@ -5,7 +5,6 @@ import (
 	"encoding/binary"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/big"
 	"math/rand"
 	"os"
@@ -645,11 +644,10 @@ func TestMinMaxWithNilFoundSet(t *testing.T) {
 }
 
 func TestBSIWriteToReadFrom(t *testing.T) {
-	file, err := ioutil.TempFile("./testdata", "bsi-test")
+	file, err := os.CreateTemp(t.TempDir(), "bsi-test")
 	if err != nil {
 		t.Fatal(err)
 	}
-	defer t.Cleanup(func() { os.Remove(file.Name()) })
 	defer file.Close()
 	bsi, min, max := setupRandom()
 	_, err = bsi.WriteTo(file)

roaring64/iter.go

@@ -1,9 +1,11 @@
 package roaring64
 
+import "iter"
+
 // Values returns an iterator that yields the elements of the bitmap in
 // increasing order. Starting with Go 1.23, users can use a for loop to iterate
 // over it.
-func Values(b *Bitmap) func(func(uint64) bool) {
+func Values(b *Bitmap) iter.Seq[uint64] {
 	return func(yield func(uint64) bool) {
 		it := b.Iterator()
 		for it.HasNext() {
@@ -17,7 +19,7 @@ func Values(b *Bitmap) func(func(uint64) bool) {
 // Backward returns an iterator that yields the elements of the bitmap in
 // decreasing order. Starting with Go 1.23, users can use a for loop to iterate
 // over it.
-func Backward(b *Bitmap) func(func(uint64) bool) {
+func Backward(b *Bitmap) iter.Seq[uint64] {
 	return func(yield func(uint64) bool) {
 		it := b.ReverseIterator()
 		for it.HasNext() {

roaring64/serialization_test.go

@@ -6,7 +6,6 @@ import (
 	"bytes"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math"
 	"os"
 	"path/filepath"
@@ -87,7 +86,7 @@ func TestSerializationBasic037(t *testing.T) {
 
 func TestSerializationToFile038(t *testing.T) {
 	rb := BitmapOf(1, 2, 3, 4, 5, 100, 1000)
-	fname := "myfile.bin"
+	fname := filepath.Join(t.TempDir(), "myfile.bin")
 	fout, err := os.OpenFile(fname, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0o660)
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
@@ -114,10 +113,7 @@ func TestSerializationToFile038(t *testing.T) {
 	buf := bytes.NewBuffer(nil)
 	teer := io.TeeReader(fin, buf)
 
-	defer func() {
-		fin.Close()
-		_ = os.Remove(fname)
-	}()
+	defer fin.Close()
 
 	_, _ = newrb.ReadFrom(teer)
 	assert.True(t, rb.Equals(newrb))
@@ -276,7 +272,7 @@ func Test_tryReadFromRoaring32WithRoaring64(t *testing.T) {
 }
 
 func Test_tryReadFromRoaring32WithRoaring64_File(t *testing.T) {
-	tempDir, err := ioutil.TempDir("./", "testdata")
+	tempDir, err := os.MkdirTemp("./", "testdata")
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "\n\nIMPORTANT: For testing file IO, the roaring library requires disk access.\nWe omit some tests for now.\n\n")
 		return
@@ -290,7 +286,7 @@ func Test_tryReadFromRoaring32WithRoaring64_File(t *testing.T) {
 	}
 
 	name := filepath.Join(tempDir, "r32")
-	if err := ioutil.WriteFile(name, bs, 0o600); err != nil {
+	if err := os.WriteFile(name, bs, 0o600); err != nil {
 		t.Fatal(err)
 	}
 	file, err := os.Open(name)