From 6da83ac9f540e1aeb2dfd23a814bb2143b38022b Mon Sep 17 00:00:00 2001
From: greatroar <61184462+greatroar@users.noreply.github.com>
Date: Sun, 24 Jan 2021 20:19:10 +0100
Subject: [PATCH] lib/util: Remove duplicate error handling code (#7299)

This is also in lib/svcutil, and never used by clients.

Co-authored-by: greatroar <@>
---
 lib/util/utils.go | 44 --------------------------------------------
 1 file changed, 44 deletions(-)

diff --git a/lib/util/utils.go b/lib/util/utils.go
index f6cc0bf88..85485a995 100644
--- a/lib/util/utils.go
+++ b/lib/util/utils.go
@@ -15,8 +15,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	"github.com/thejerf/suture/v4"
 )
 
 type defaultParser interface {
@@ -252,48 +250,6 @@ func AddressUnspecifiedLess(a, b net.Addr) bool {
 	return aIsUnspecified
 }
 
-type FatalErr struct {
-	Err    error
-	Status ExitStatus
-}
-
-func (e *FatalErr) Error() string {
-	return e.Err.Error()
-}
-
-func (e *FatalErr) Unwrap() error {
-	return e.Err
-}
-
-func (e *FatalErr) Is(target error) bool {
-	return target == suture.ErrTerminateSupervisorTree
-}
-
-// NoRestartErr wraps the given error err (which may be nil) to make sure that
-// `errors.Is(err, suture.ErrDoNotRestart) == true`.
-func NoRestartErr(err error) error {
-	if err == nil {
-		return suture.ErrDoNotRestart
-	}
-	return &noRestartErr{err}
-}
-
-type noRestartErr struct {
-	err error
-}
-
-func (e *noRestartErr) Error() string {
-	return e.err.Error()
-}
-
-func (e *noRestartErr) Unwrap() error {
-	return e.err
-}
-
-func (e *noRestartErr) Is(target error) bool {
-	return target == suture.ErrDoNotRestart
-}
-
 type ExitStatus int
 
 const (