Reviewed use of new P1 to use P.lazy

mperry · mperry · commit 2d6a8dd44122 · 2015-08-27T19:58:20.000+10:00
diff --git a/core/src/main/java/fj/control/parallel/Callables.java b/core/src/main/java/fj/control/parallel/Callables.java
@@ -166,16 +166,13 @@ public static <A> F<List<Callable<A>>, Callable<List<A>>> sequence_() {
    * @return An optional value that yields the value in the Callable, or None if the Callable fails.
    */
   public static <A> P1<Option<A>> option(final Callable<A> a) {
-    return new P1<Option<A>>() {
-      @SuppressWarnings({"UnusedCatchParameter"})
-      public Option<A> _1() {
+    return P.lazy(() -> {
         try {
           return some(a.call());
         } catch (Exception e) {
           return none();
         }
-      }
-    };
+    });
   }
 
   /**
diff --git a/core/src/main/java/fj/data/vector/V8.java b/core/src/main/java/fj/data/vector/V8.java
@@ -228,12 +228,7 @@ public NonEmptyList<A> toNonEmptyList() {
    * @return a stream of the elements of this vector.
    */
   public Stream<A> toStream() {
-    return Stream.cons(head._1(), new P1<Stream<A>>() {
-        F0<Stream<A>> f = 100;
-      public Stream<A> _1() {
-        return tail.toStream();
-      }
-    });
+    return Stream.cons(head._1(), P.lazy(() -> tail.toStream()));
   }
 
   /**
