all, vendor: Switch back to non-forked thejerf/suture (#5171)

lib/discover/cache.go

@@ -10,10 +10,10 @@ import (
 	stdsync "sync"
 	"time"
 
-	"github.com/calmh/suture"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/sync"
 	"github.com/syncthing/syncthing/lib/util"
+	"github.com/thejerf/suture"
 )
 
 // The CachingMux aggregates results from multiple Finders. Each Finder has
@@ -52,7 +52,7 @@ type cachedError interface {
 func NewCachingMux() CachingMux {
 	return &cachingMux{
 		Supervisor: suture.New("discover.cachingMux", suture.Spec{
-			PanicPanics: true,
+			PassThroughPanics: true,
 		}),
 		mut: sync.NewRWMutex(),
 	}

lib/discover/discover.go

@@ -9,8 +9,8 @@ package discover
 import (
 	"time"
 
-	"github.com/calmh/suture"
 	"github.com/syncthing/syncthing/lib/protocol"
+	"github.com/thejerf/suture"
 )
 
 // A Finder provides lookup services of some kind.

lib/discover/local.go

@@ -18,11 +18,11 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/calmh/suture"
 	"github.com/syncthing/syncthing/lib/beacon"
 	"github.com/syncthing/syncthing/lib/events"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/rand"
+	"github.com/thejerf/suture"
 )
 
 type localClient struct {
@@ -49,7 +49,7 @@ const (
 func NewLocal(id protocol.DeviceID, addr string, addrList AddressLister) (FinderService, error) {
 	c := &localClient{
 		Supervisor: suture.New("local", suture.Spec{
-			PanicPanics: true,
+			PassThroughPanics: true,
 		}),
 		myID:            id,
 		addrList:        addrList,