refactor: Make Result/Option new* return the base class

This is so that it is different to the plain old constructor.

Author: MarcellPerger1

src/main/java/net/marcellperger/mathexpr/util/rs/Option.java

@@ -35,13 +35,14 @@ record None<T>() implements Option<T> {
         }
     }
 
+    // Same as new Some/None but return Option
     @Contract("_ -> new")
-    static <T> @NotNull Some<T> newSome(T value) {
+    static <T> @NotNull Option<T> newSome(T value) {
         return new Some<>(value);
     }
 
     @Contract(" -> new")
-    static <T> @NotNull None<T> newNone() {
+    static <T> @NotNull Option<T> newNone() {
         return new None<>();
     }
 

src/main/java/net/marcellperger/mathexpr/util/rs/Result.java

@@ -43,10 +43,11 @@ public String toString() {
         }
     }
 
-    static <T, E> Ok<T, E> newOk(T value) {
+    // same as new Ok/Err but return Option
+    static <T, E> Result<T, E> newOk(T value) {
         return new Ok<>(value);
     }
-    static <T, E> Err<T, E> newErr(E err) {
+    static <T, E> Result<T, E> newErr(E err) {
         return new Err<>(err);
     }
 

src/test/java/net/marcellperger/mathexpr/util/rs/OptionTest.java

@@ -1,8 +1,6 @@
 package net.marcellperger.mathexpr.util.rs;
 
 import net.marcellperger.mathexpr.MiniMock.*;
-import net.marcellperger.mathexpr.util.rs.Option.Some;
-import net.marcellperger.mathexpr.util.rs.Option.None;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -12,10 +10,10 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 class OptionTest {
-    Some<Integer> getSome() {
+    Option<Integer> getSome() {
         return Option.newSome(314);
     }
-    None<Integer> getNone() {
+    Option<Integer> getNone() {
         return Option.newNone();
     }