Merge pull request #3 from GoCarnival/develop

🚀 Deploy stuff.
GoCarnival · May 7, 2024 · 554e1bc · 554e1bc
2 parents 66f11e8 + a4a7410
commit 554e1bc
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 26 deletions.
diff --git a/iter/iter.go b/iter/iter.go
@@ -4,7 +4,7 @@ import (
 	"runtime"
 	"sync/atomic"
 
-	"github.com/GoCarnivalConc/conc"
+	"github.com/GoCarnival/conc"
 )
 
 // defaultMaxGoroutines returns the default maximum number of

diff --git a/iter/iter_test.go b/iter/iter_test.go
@@ -6,7 +6,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/GoCarnivalConc/conc/iter"
+	"github.com/GoCarnival/conc/iter"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/iter/map.go b/iter/map.go
@@ -1,7 +1,7 @@
 package iter
 
 import (
-	"github.com/GoCarnivalConc/conc/errors"
+	"github.com/GoCarnival/conc/errors"
 	"sync"
 )
 

diff --git a/iter/map_test.go b/iter/map_test.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/GoCarnivalConc/conc/iter"
+	"github.com/GoCarnival/conc/iter"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/panics/panics.go b/panics/panics.go
@@ -42,8 +42,12 @@ func (p *Catcher) Repanic() {
 // Recovered returns the value of the first panic caught by Try, or nil if
 // no calls to Try panicked.
 func (p *Catcher) Recovered() *Recovered {
-	recovered := p.recovered.Load().(Recovered)
-	return &recovered
+	val := p.recovered.Load()
+	if val == nil {
+		return nil
+	}
+	recovered := val.(*Recovered)
+	return recovered
 }
 
 // NewRecovered creates a panics.Recovered from a panic value and a collected

diff --git a/panics/panics_test.go b/panics/panics_test.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"testing"
 
-	"github.com/GoCarnivalConc/conc/panics"
+	"github.com/GoCarnival/conc/panics"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -50,11 +50,11 @@ func ExampleCatcher_callers() {
 		}
 	}
 	// Output:
-	// github.com/GoCarnivalConc/conc/panics.(*Catcher).tryRecover
+	// github.com/GoCarnival/conc/panics.(*Catcher).tryRecover
 	// runtime.gopanic
-	// github.com/GoCarnivalConc/conc/panics_test.ExampleCatcher_callers.func1
-	// github.com/GoCarnivalConc/conc/panics.(*Catcher).Try
-	// github.com/GoCarnivalConc/conc/panics_test.ExampleCatcher_callers
+	// github.com/GoCarnival/conc/panics_test.ExampleCatcher_callers.func1
+	// github.com/GoCarnival/conc/panics.(*Catcher).Try
+	// github.com/GoCarnival/conc/panics_test.ExampleCatcher_callers
 	// testing.runExample
 	// testing.runExamples
 	// testing.(*M).Run

diff --git a/panics/try_test.go b/panics/try_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/GoCarnivalConc/conc/panics"
+	"github.com/GoCarnival/conc/panics"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/pool/context_pool_test.go b/pool/context_pool_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc/pool"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/pool/error_pool.go b/pool/error_pool.go
@@ -2,7 +2,7 @@ package pool
 
 import (
 	"context"
-	"github.com/GoCarnivalConc/conc/errors"
+	"github.com/GoCarnival/conc/errors"
 	"sync"
 )
 

diff --git a/pool/error_pool_test.go b/pool/error_pool_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc/pool"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/pool/pool.go b/pool/pool.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/GoCarnivalConc/conc"
+	"github.com/GoCarnival/conc"
 )
 
 // New creates a new Pool.

diff --git a/pool/pool_test.go b/pool/pool_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc/pool"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/pool/result_context_pool_test.go b/pool/result_context_pool_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc/pool"
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

diff --git a/pool/result_error_pool_test.go b/pool/result_error_pool_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc/pool"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/pool/result_pool_test.go b/pool/result_pool_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc/pool"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/stream/stream.go b/stream/stream.go
@@ -4,9 +4,9 @@ package stream
 import (
 	"sync"
 
-	"github.com/GoCarnivalConc/conc"
-	"github.com/GoCarnivalConc/conc/panics"
-	"github.com/GoCarnivalConc/conc/pool"
+	"github.com/GoCarnival/conc"
+	"github.com/GoCarnival/conc/panics"
+	"github.com/GoCarnival/conc/pool"
 )
 
 // New creates a new Stream with default settings.

diff --git a/stream/stream_test.go b/stream/stream_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/GoCarnivalConc/conc/stream"
+	"github.com/GoCarnival/conc/stream"
 
 	"github.com/stretchr/testify/require"
 )

diff --git a/waitgroup.go b/waitgroup.go
@@ -3,7 +3,7 @@ package conc
 import (
 	"sync"
 
-	"github.com/GoCarnivalConc/conc/panics"
+	"github.com/GoCarnival/conc/panics"
 )
 
 // NewWaitGroup creates a new WaitGroup.

diff --git a/waitgroup_test.go b/waitgroup_test.go
@@ -5,7 +5,7 @@ import (
 	"sync/atomic"
 	"testing"
 
-	"github.com/GoCarnivalConc/conc"
+	"github.com/GoCarnival/conc"
 
 	"github.com/stretchr/testify/require"
 )