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

cmd/syncthing/gui_test.go

@@ -23,13 +23,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/calmh/suture"
 	"github.com/d4l3k/messagediff"
 	"github.com/syncthing/syncthing/lib/config"
 	"github.com/syncthing/syncthing/lib/events"
 	"github.com/syncthing/syncthing/lib/fs"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/sync"
+	"github.com/thejerf/suture"
 )
 
 func TestCSRFToken(t *testing.T) {
@@ -78,7 +78,7 @@ func TestStopAfterBrokenConfig(t *testing.T) {
 	srv.started = make(chan string)
 
 	sup := suture.New("test", suture.Spec{
-		PanicPanics: true,
+		PassThroughPanics: true,
 	})
 	sup.Add(srv)
 	sup.ServeBackground()
@@ -490,7 +490,7 @@ func startHTTP(cfg *mockedConfig) (string, error) {
 
 	// Actually start the API service
 	supervisor := suture.New("API test", suture.Spec{
-		PanicPanics: true,
+		PassThroughPanics: true,
 	})
 	supervisor.Add(svc)
 	supervisor.ServeBackground()

cmd/syncthing/main.go

@@ -47,7 +47,7 @@ import (
 	"github.com/syncthing/syncthing/lib/tlsutil"
 	"github.com/syncthing/syncthing/lib/upgrade"
 
-	"github.com/calmh/suture"
+	"github.com/thejerf/suture"
 
 	_ "net/http/pprof" // Need to import this to support STPROFILER.
 )
@@ -594,7 +594,7 @@ func syncthingMain(runtimeOptions RuntimeOptions) {
 		Log: func(line string) {
 			l.Debugln(line)
 		},
-		PanicPanics: true,
+		PassThroughPanics: true,
 	})
 	mainService.ServeBackground()
 

cmd/syncthing/summaryservice.go

@@ -9,10 +9,10 @@ package main
 import (
 	"time"
 
-	"github.com/calmh/suture"
 	"github.com/syncthing/syncthing/lib/events"
 	"github.com/syncthing/syncthing/lib/protocol"
 	"github.com/syncthing/syncthing/lib/sync"
+	"github.com/thejerf/suture"
 )
 
 // The folderSummaryService adds summary information events (FolderSummary and
@@ -37,7 +37,7 @@ type folderSummaryService struct {
 func newFolderSummaryService(cfg configIntf, m modelIntf) *folderSummaryService {
 	service := &folderSummaryService{
 		Supervisor: suture.New("folderSummaryService", suture.Spec{
-			PanicPanics: true,
+			PassThroughPanics: true,
 		}),
 		cfg:             cfg,
 		model:           m,