diff --git a/bar_option.go b/bar_option.go index 47ebe51..5e06c12 100644 --- a/bar_option.go +++ b/bar_option.go @@ -5,7 +5,6 @@ "io" "github.com/vbauerster/mpb/v7/decor" - "github.com/vbauerster/mpb/v7/internal" ) // BarOption is a func option to alter default behavior of a bar. @@ -149,7 +148,10 @@ // BarOptional will invoke provided option only when pick is true. func BarOptional(option BarOption, pick bool) BarOption { - return BarOptOn(option, internal.Predicate(pick)) + if pick { + return option + } + return nil } // BarOptOn will invoke provided option only when higher order predicate diff --git a/container_option.go b/container_option.go index a858c3c..7e5bbad 100644 --- a/container_option.go +++ b/container_option.go @@ -5,8 +5,6 @@ "io/ioutil" "sync" "time" - - "github.com/vbauerster/mpb/v7/internal" ) // ContainerOption is a func option to alter default behavior of a bar @@ -103,7 +101,10 @@ // ContainerOptional will invoke provided option only when pick is true. func ContainerOptional(option ContainerOption, pick bool) ContainerOption { - return ContainerOptOn(option, internal.Predicate(pick)) + if pick { + return option + } + return nil } // ContainerOptOn will invoke provided option only when higher order diff --git a/internal/predicate.go b/internal/predicate.go deleted file mode 100644 index 1e4dd24..0000000 --- a/internal/predicate.go +++ /dev/null @@ -1,6 +0,0 @@ -package internal - -// Predicate helper for internal use. -func Predicate(pick bool) func() bool { - return func() bool { return pick } -}