fix: fix import conflict

Author: initdc

README.md

@@ -14,7 +14,7 @@ package e2e_test
 import (
 	"fmt"
 	. "github.com/initdc/types/option"
-	types "github.com/initdc/types/result"
+	. "github.com/initdc/types/result"
 	"testing"
 )
 
@@ -29,14 +29,14 @@ func TestE2E(t *testing.T) {
 
 
 	// Result
-	var r1 types.Result[int, string]
+	var r1 Result[int, string]
 	r1.Ok(1)
 
-	var e1 types.Result[int, string]
+	var e1 Result[int, string]
 	e1.Err("error")
 
-	r2 := types.Ok[int, string](1)
-	e2 := types.Err[int, string]("error")
+	r2 := Ok[int, string](1)
+	e2 := Err[int, string]("error")
 
 	fmt.Printf("%#v\n", s1)
 	fmt.Printf("%#v\n", s2)

e2e_test.go

@@ -3,7 +3,7 @@ package e2e_test
 import (
 	"fmt"
 	. "github.com/initdc/types/option"
-	types "github.com/initdc/types/result"
+	. "github.com/initdc/types/result"
 	"testing"
 )
 
@@ -18,14 +18,14 @@ func TestE2E(t *testing.T) {
 
 
 	// Result
-	var r1 types.Result[int, string]
+	var r1 Result[int, string]
 	r1.Ok(1)
 
-	var e1 types.Result[int, string]
+	var e1 Result[int, string]
 	e1.Err("error")
 
-	r2 := types.Ok[int, string](1)
-	e2 := types.Err[int, string]("error")
+	r2 := Ok[int, string](1)
+	e2 := Err[int, string]("error")
 
 	fmt.Printf("%#v\n", s1)
 	fmt.Printf("%#v\n", s2)

option/option.go

@@ -109,7 +109,7 @@ func (o Option[T]) UnwrapOrDefault() T {
 	return zero
 }
 
-func Map[T, U any](o Option[T], f func(T) U) Option[U] {
+func OptionMap[T, U any](o Option[T], f func(T) U) Option[U] {
 	if o.some {
 		return Some[U](f(o.value))
 	}
@@ -123,21 +123,21 @@ func (o Option[T]) Inspect(f func(T)) Option[T] {
 	return o
 }
 
-func MapOr[T, U any](o Option[T], def U, f func(T) U) U {
+func OptionMapOr[T, U any](o Option[T], def U, f func(T) U) U {
 	if o.some {
 		return f(o.value)
 	}
 	return def
 }
 
-func MapOrElse[T, U any](o Option[T], def func() U, f func(T) U) U {
+func OptionMapOrElse[T, U any](o Option[T], def func() U, f func(T) U) U {
 	if o.some {
 		return f(o.value)
 	}
 	return def()
 }
 
-func MapOrDefault[T, U any](o Option[T], f func(T) U) U {
+func OptionMapOrDefault[T, U any](o Option[T], f func(T) U) U {
 	if o.some {
 		return f(o.value)
 	}
@@ -159,14 +159,14 @@ func OkOrElse[T, E any](o Option[T], err func() E) result.Result[T, E] {
 	return result.Err[T, E](err())
 }
 
-func And[T, U any](o Option[T], optb Option[U]) Option[U] {
+func OptionAnd[T, U any](o Option[T], optb Option[U]) Option[U] {
 	if o.some {
 		return optb
 	}
 	return None[U]()
 }
 
-func AndThen[T, U any](o Option[T], f func(T) Option[U]) Option[U] {
+func OptionAndThen[T, U any](o Option[T], f func(T) Option[U]) Option[U] {
 	if o.some {
 		return f(o.value)
 	}

option/option_test.go

@@ -114,12 +114,12 @@ func TestUnwrapOrDefault(t *testing.T) {
 	assert.Equal(t, n.UnwrapOrDefault(), 0)
 }
 
-func TestMap(t *testing.T) {
+func TestOptionMap(t *testing.T) {
 	s := Some("Hello, World!")
-	assert.Equal(t, Map(s, func(s string) int { return len(s) }), Some[int](13))
+	assert.Equal(t, OptionMap(s, func(s string) int { return len(s) }), Some[int](13))
 
 	n := None[string]()
-	assert.Equal(t, Map(n, func(s string) int { return len(s) }), None[int]())
+	assert.Equal(t, OptionMap(n, func(s string) int { return len(s) }), None[int]())
 }
 
 func TestInspect(t *testing.T) {
@@ -130,31 +130,31 @@ func TestInspect(t *testing.T) {
 	assert.Equal(t, n.Inspect(func(x int) {}), n)
 }
 
-func TestMapOr(t *testing.T) {
+func TestOptionMapOr(t *testing.T) {
 	s := Some("foo")
-	assert.Equal(t, MapOr(s, 42, func(v string) int { return len(v) }), 3)
+	assert.Equal(t, OptionMapOr(s, 42, func(v string) int { return len(v) }), 3)
 
 	n := None[string]()
-	assert.Equal(t, MapOr(n, 42, func(v string) int { return len(v) }), 42)
+	assert.Equal(t, OptionMapOr(n, 42, func(v string) int { return len(v) }), 42)
 }
 
-func TestMapOrElse(t *testing.T) {
+func TestOptionMapOrElse(t *testing.T) {
 	k := 21
 	s := Some("foo")
-	assert.Equal(t, MapOrElse(s, func() int { return 2 * k }, func(v string) int { return len(v) }), 3)
+	assert.Equal(t, OptionMapOrElse(s, func() int { return 2 * k }, func(v string) int { return len(v) }), 3)
 
 	n := None[string]()
-	assert.Equal(t, MapOrElse(n, func() int { return 2 * k }, func(v string) int { return len(v) }), 42)
+	assert.Equal(t, OptionMapOrElse(n, func() int { return 2 * k }, func(v string) int { return len(v) }), 42)
 }
 
-func TestMapOrDefault(t *testing.T) {
+func TestOptionMapOrDefault(t *testing.T) {
 	f := func(s string) int { return len(s)}
   s := Some("hi")
 
-	assert.Equal(t, MapOrDefault(s, f), 2)
+	assert.Equal(t, OptionMapOrDefault(s, f), 2)
 
 	n := None[string]()
-	assert.Equal(t, MapOrDefault(n, f), 0)
+	assert.Equal(t, OptionMapOrDefault(n, f), 0)
 }
 
 func TestOkOr(t *testing.T) {
@@ -174,35 +174,35 @@ func TestOkOrElse(t *testing.T) {
 }
 
 
-func TestAnd(t *testing.T) {
+func TestOptionAnd(t *testing.T) {
 	x := Some(2)
 	y := None[string]()
-	assert.Equal(t, And(x, y), None[string]())
+	assert.Equal(t, OptionAnd(x, y), None[string]())
 
 	x2 := None[int]()
 	y2 := Some("foo")
-	assert.Equal(t, And(x2, y2), None[string]())
+	assert.Equal(t, OptionAnd(x2, y2), None[string]())
 
 	x3 := Some(2)
 	y3 := Some("foo")
-	assert.Equal(t, And(x3, y3), Some("foo"))
+	assert.Equal(t, OptionAnd(x3, y3), Some("foo"))
 
 	x4 := None[int]()
 	y4 := None[string]()
-	assert.Equal(t, And(x4, y4), None[string]())
+	assert.Equal(t, OptionAnd(x4, y4), None[string]())
 }
 
-func TestAndThen(t *testing.T) {
+func TestOptionAndThen(t *testing.T) {
 	sqThenToString := func(x int) Option[string] {
 		if x > 100 || x < 0 {
 			return None[string]()
 		}
 		return Some(strconv.Itoa(x))
 	}
 
-	assert.Equal(t, AndThen(Some(2), sqThenToString), Some[string]("2"))
-	assert.Equal(t, AndThen(Some(1000), sqThenToString), None[string]())
-	assert.Equal(t, AndThen(None[int](), sqThenToString), None[string]())
+	assert.Equal(t, OptionAndThen(Some(2), sqThenToString), Some[string]("2"))
+	assert.Equal(t, OptionAndThen(Some(1000), sqThenToString), None[string]())
+	assert.Equal(t, OptionAndThen(None[int](), sqThenToString), None[string]())
 }
 
 func TestFilter(t *testing.T) {