diff --git a/bar.go b/bar.go index 30a3cea..3b5cebd 100644 --- a/bar.go +++ b/bar.go @@ -671,7 +671,7 @@ func extractBaseDecorator(d decor.Decorator) decor.Decorator { if d, ok := d.(decor.Wrapper); ok { - return extractBaseDecorator(d.Base()) + return extractBaseDecorator(d.Unwrap()) } return d } diff --git a/decor/decorator.go b/decor/decorator.go index a43a139..90e1d6c 100644 --- a/decor/decorator.go +++ b/decor/decorator.go @@ -93,7 +93,7 @@ // it is necessary to implement this interface to retain functionality // of built-in Decorator. type Wrapper interface { - Base() Decorator + Unwrap() Decorator } // EwmaDecorator interface. diff --git a/decor/merge.go b/decor/merge.go index cc9a512..a30b785 100644 --- a/decor/merge.go +++ b/decor/merge.go @@ -63,7 +63,7 @@ return d.wc.Sync() } -func (d *mergeDecorator) Base() Decorator { +func (d *mergeDecorator) Unwrap() Decorator { return d.Decorator } diff --git a/decor/on_abort.go b/decor/on_abort.go index f9a1197..e36a63c 100644 --- a/decor/on_abort.go +++ b/decor/on_abort.go @@ -35,6 +35,6 @@ return d.Decorator.Decor(s) } -func (d *onAbortWrapper) Base() Decorator { +func (d *onAbortWrapper) Unwrap() Decorator { return d.Decorator } diff --git a/decor/on_complete.go b/decor/on_complete.go index 663ec36..837d067 100644 --- a/decor/on_complete.go +++ b/decor/on_complete.go @@ -34,6 +34,6 @@ return d.Decorator.Decor(s) } -func (d *onCompleteWrapper) Base() Decorator { +func (d *onCompleteWrapper) Unwrap() Decorator { return d.Decorator }