Run go fix; apply additional manual fixes

1 files changed, 4 insertions, 8 deletions

diff --git a/closeevent.go b/closeevent.go
index 620b5743..34843b57 100644
--- a/closeevent.go
+++ b/closeevent.go
@@ -10,17 +10,13 @@ type CloseEvent struct {
 	handlers []CloseEventHandler
 }
 
-func (e *CloseEvent) Attach(handler CloseEventHandler) {
+func (e *CloseEvent) Attach(handler CloseEventHandler) int {
 	e.handlers = append(e.handlers, handler)
+	return len(e.handlers) - 1
 }
 
-func (e *CloseEvent) Detach(handler CloseEventHandler) {
-	for i, h := range e.handlers {
-		if h == handler {
-			e.handlers = append(e.handlers[:i], e.handlers[i+1:]...)
-			return
-		}
-	}
+func (e *CloseEvent) Detach(handle int) {
+	e.handlers = append(e.handlers[:handle], e.handlers[handle+1:]...)
 }
 
 type CloseEventPublisher struct {