From 8f8d872a68eabf2a3f476948a4be88bb005d7c68 Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Thu, 9 May 2024 23:26:21 +0200 Subject: [PATCH] fix compatibility with go 1.19 --- internal/checker/checker_test.go | 2 +- internal/repository/repository_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/internal/checker/checker_test.go b/internal/checker/checker_test.go index 5fc82eed0..ee18f893a 100644 --- a/internal/checker/checker_test.go +++ b/internal/checker/checker_test.go @@ -333,7 +333,7 @@ type errorOnceBackend struct { } func (b *errorOnceBackend) Load(ctx context.Context, h backend.Handle, length int, offset int64, consumer func(rd io.Reader) error) error { - _, isRetry := b.m.Swap(h, struct{}{}) + _, isRetry := b.m.LoadOrStore(h, struct{}{}) return b.Backend.Load(ctx, h, length, offset, func(rd io.Reader) error { if !isRetry && h.Type != restic.ConfigFile { return consumer(errorReadCloser{rd}) diff --git a/internal/repository/repository_test.go b/internal/repository/repository_test.go index 6f67e2c5e..67622fdf8 100644 --- a/internal/repository/repository_test.go +++ b/internal/repository/repository_test.go @@ -296,8 +296,8 @@ func (be *damageOnceBackend) Load(ctx context.Context, h backend.Handle, length } h.IsMetadata = false - _, retry := be.m.Swap(h, true) - if !retry { + _, isRetry := be.m.LoadOrStore(h, true) + if !isRetry { // return broken data on the first try offset++ }