Micro optimizations (#18)

Author: Dean Karn

values/option/option.go

@@ -34,10 +34,10 @@ func (o Option[T]) IsNone() bool {
 
 // Unwrap returns the values if the option is not empty or panics.
 func (o Option[T]) Unwrap() T {
-	if o.IsNone() {
-		panic("Option.Unwrap: option is None")
+	if o.isSome {
+		return o.value
 	}
-	return o.value
+	panic("Option.Unwrap: option is None")
 }
 
 // Some creates a new Option with the given values.
@@ -52,10 +52,10 @@ func None[T any]() Option[T] {
 
 // MarshalJSON implements the json.Marshaler interface.
 func (o Option[T]) MarshalJSON() ([]byte, error) {
-	if o.IsNone() {
-		return []byte("null"), nil
+	if o.isSome {
+		return json.Marshal(o.value)
 	}
-	return json.Marshal(o.value)
+	return []byte("null"), nil
 }
 
 // UnmarshalJSON implements the json.Unmarshaler interface.
@@ -74,11 +74,11 @@ func (o *Option[T]) UnmarshalJSON(data []byte) error {
 }
 
 // Value implements the driver.Valuer interface.
-func (o *Option[T]) Value() (driver.Value, error) {
-	if o.IsNone() {
-		return nil, nil
+func (o Option[T]) Value() (driver.Value, error) {
+	if o.isSome {
+		return o.Unwrap(), nil
 	}
-	return o.Unwrap(), nil
+	return nil, nil
 }
 
 // Scan implements the sql.Scanner interface.

values/result/result.go

@@ -27,15 +27,15 @@ func (r Result[T, E]) IsOk() bool {
 
 // IsErr returns true if the result is not successful and has an error.
 func (r Result[T, E]) IsErr() bool {
-	return !r.IsOk()
+	return !r.isOk
 }
 
 // Unwrap returns the values of the result. It panics if there is no result due to not checking for errors.
 func (r Result[T, E]) Unwrap() T {
-	if !r.isOk {
-		panic("Result.Unwrap(): result is Err")
+	if r.isOk {
+		return r.ok
 	}
-	return r.ok
+	panic("Result.Unwrap(): result is Err")
 }
 
 // Err returns the error of the result. To be used after calling IsOK()