upgrade CI ti go 1.18.4

medmouine · Aug 18, 2022 · 0f6be4f · 0f6be4f
1 parent 85d12d9
commit 0f6be4f
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 36 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           stable: 'false'
-          go-version: '1.18.0-beta1'
+          go-version: '1.18.4'
       - name: Prepare
         run: |
           go get -u golang.org/x/lint/golint

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           stable: 'false'
-          go-version: '1.18.0-beta1'
+          go-version: '1.18.4'
       - name: Test
         run: |
           go test -v ./... -coverprofile=coverage.txt -covermode=atomic

diff --git a/.gitignore b/.gitignore
@@ -128,6 +128,7 @@ fabric.properties
 .idea/**/markdown-navigator.xml
 .idea/**/markdown-navigator-enh.xml
 .idea/**/markdown-navigator/
+**/.idea
 
 # Cache file creation bug
 # See https://youtrack.jetbrains.com/issue/JBR-2257

diff --git a/README.md b/README.md
@@ -10,8 +10,6 @@
 
 <img src="./img/gomad-logo.png" alt="drawing" width="600"/>
 
-Note: The package is currently available on pkg.go.dev and ready to use with Golang 1.18-alpha. I am waiting for the stable release of v1.18 to officially release Gomad v1.0.0.
-
 # **GOMAD**: Functional Patterns in Golang
 - [Prerequisites](#prerequisites)
 - [Install](#install)

diff --git a/either/either_test.go b/either/either_test.go
@@ -281,8 +281,8 @@ func TestEither_MaybeLeft(t *testing.T) {
 	if !got.IsSome() {
 		t.Errorf("MaybeLeft() = %v, want %v", got.IsSome(), true)
 
-		if !reflect.DeepEqual(got.Unwrap(), "foo") {
-			t.Errorf("MaybeLeft() = %v, want %v", got.Unwrap(), "foo")
+		if !reflect.DeepEqual(*got.Unwrap(), "foo") {
+			t.Errorf("MaybeLeft() = %v, want %v", *got.Unwrap(), "foo")
 		}
 	}
 
@@ -301,8 +301,8 @@ func TestEither_MaybeRight(t *testing.T) {
 	if !got.IsSome() {
 		t.Errorf("MaybeRight() = %v, want %v", got.IsSome(), true)
 
-		if !reflect.DeepEqual(got.Unwrap(), "foo") {
-			t.Errorf("MaybeRight() = %v, want %v", got.Unwrap(), "foo")
+		if !reflect.DeepEqual(*got.Unwrap(), "foo") {
+			t.Errorf("MaybeRight() = %v, want %v", *got.Unwrap(), "foo")
 		}
 	}
 

diff --git a/identity/identity.go b/identity/identity.go
@@ -1,5 +1,5 @@
 package identity
 
-func Identity[T any](i T) *T {
-	return &i
+func Identity[T any](i T) T {
+	return i
 }
diff --git a/maybe/maybe.go b/maybe/maybe.go
@@ -98,6 +98,7 @@ func (m maybe[T]) IsNil() bool {
 func (m maybe[T]) OrElse(f func() T) *T {
 	if m.IsNil() {
 		v := f()
+
 		return &v
 	}
 

diff --git a/maybe/maybe_test.go b/maybe/maybe_test.go
@@ -13,8 +13,8 @@ func TestMaybe_Just(t *testing.T) {
 	integer := 123
 	gotInt := Just(integer)
 
-	if !reflect.DeepEqual(gotInt.Unwrap(), integer) {
-		t.Errorf("Just() = %v, want %v", gotInt.Unwrap(), integer)
+	if !reflect.DeepEqual(*gotInt.Unwrap(), integer) {
+		t.Errorf("Just() = %v, want %v", *gotInt.Unwrap(), integer)
 	}
 
 	if !reflect.DeepEqual(gotInt.IsNil(), false) {
@@ -24,15 +24,15 @@ func TestMaybe_Just(t *testing.T) {
 	_string := "abc"
 	gotStr := Just(_string)
 
-	if !reflect.DeepEqual(gotStr.Unwrap(), _string) {
-		t.Errorf("Just() = %v, want %v", gotStr.Unwrap(), _string)
+	if !reflect.DeepEqual(*gotStr.Unwrap(), _string) {
+		t.Errorf("Just() = %v, want %v", *gotStr.Unwrap(), _string)
 	}
 
 	_slice := []int{1, 2, 3}
 	gotSlice := Just(_slice)
 
-	if !reflect.DeepEqual(gotSlice.Unwrap(), _slice) {
-		t.Errorf("Just() = %v, want %v", gotSlice.Unwrap(), _slice)
+	if !reflect.DeepEqual(*gotSlice.Unwrap(), _slice) {
+		t.Errorf("Just() = %v, want %v", *gotSlice.Unwrap(), _slice)
 	}
 }
 
@@ -49,14 +49,14 @@ func TestMaybe_Of(t *testing.T) {
 	t.Parallel()
 
 	integer := 123
-	gotInteger := Of(&integer)
+	gotInt := Of(&integer)
 
-	if !reflect.DeepEqual(gotInteger.Unwrap(), integer) {
-		t.Errorf("Of() = %v, want %v", gotInteger.Unwrap(), integer)
+	if !reflect.DeepEqual(*gotInt.Unwrap(), integer) {
+		t.Errorf("Of() = %v, want %v", *gotInt.Unwrap(), integer)
 	}
 
-	if gotInteger.IsNil() {
-		t.Errorf("Of() = %v, want %v", gotInteger.IsNil(), false)
+	if gotInt.IsNil() {
+		t.Errorf("Of() = %v, want %v", gotInt.IsNil(), false)
 	}
 
 	gotNil := Of[int](nil)
@@ -82,8 +82,8 @@ func TestMaybe_Apply(t *testing.T) {
 		t.Errorf("Apply() called = %v, want %v", called, true)
 	}
 
-	if !reflect.DeepEqual(m.Unwrap(), integer) {
-		t.Errorf("Apply() = %v, want %v", m.Unwrap(), integer)
+	if !reflect.DeepEqual(*m.Unwrap(), integer) {
+		t.Errorf("Apply() = %v, want %v", *m.Unwrap(), integer)
 	}
 
 	called2 := false
@@ -103,8 +103,8 @@ func TestMaybe_Map(t *testing.T) {
 	got := Just(1).Map(func(v int) int {
 		return v + 3
 	})
-	if !reflect.DeepEqual(got.Unwrap(), 4) {
-		t.Errorf("Map() = %v, want %v", got.Unwrap(), 4)
+	if !reflect.DeepEqual(*got.Unwrap(), 4) {
+		t.Errorf("Map() = %v, want %v", *got.Unwrap(), 4)
 	}
 
 	if !got.IsSome() {
@@ -122,8 +122,8 @@ func TestMaybe_Map(t *testing.T) {
 func TestMaybe_Unwrap(t *testing.T) {
 	t.Parallel()
 
-	if got := Just(1).Unwrap(); !reflect.DeepEqual(got, 1) {
-		t.Errorf("Unwrap() = %v, want %v", got, 1)
+	if got := Just(1).Unwrap(); !reflect.DeepEqual(*got, 1) {
+		t.Errorf("Unwrap() = %v, want %v", *got, 1)
 	}
 
 	defer func() {
@@ -141,27 +141,27 @@ func TestMaybe_OrElse(t *testing.T) {
 	got := None[int]().OrElse(func() int {
 		return 3
 	})
-	if !reflect.DeepEqual(got, 3) {
-		t.Errorf("OrElse() = %v, want %v", got, 3)
+	if !reflect.DeepEqual(*got, 3) {
+		t.Errorf("OrElse() = %v, want %v", *got, 3)
 	}
 
 	got2 := Just(1).OrElse(func() int {
 		return 3
 	})
-	if !reflect.DeepEqual(got2, 1) {
-		t.Errorf("OrElse() = %v, want %v", got2, 1)
+	if !reflect.DeepEqual(*got2, 1) {
+		t.Errorf("OrElse() = %v, want %v", *got2, 1)
 	}
 }
 
 func TestMaybe_Or(t *testing.T) {
 	t.Parallel()
 
-	if got := None[int]().Or(3); !reflect.DeepEqual(got, 3) {
-		t.Errorf("Or() = %v, want %v", got, 3)
+	if got := None[int]().Or(3); !reflect.DeepEqual(*got, 3) {
+		t.Errorf("Or() = %v, want %v", *got, 3)
 	}
 
-	if got2 := Just(1).Or(3); !reflect.DeepEqual(got2, 1) {
-		t.Errorf("Or() = %v, want %v", got2, 1)
+	if got2 := Just(1).Or(3); !reflect.DeepEqual(*got2, 1) {
+		t.Errorf("Or() = %v, want %v", *got2, 1)
 	}
 }
 

diff --git a/result/result.go b/result/result.go
@@ -50,7 +50,9 @@ func FromMaybe[T any](m maybe.Maybe[T], err error) Result[T] {
 	if m.IsNil() {
 		return Err[T](err)
 	}
-	return Ok(m.Unwrap())
+
+	v := m.Unwrap()
+	return Ok[T](*v)
 }
 
 /*