Remove confusing hiding of type parameter

jbgi · jbgi · commit 345fb6c8e1be · 2016-05-24T07:41:22.000+02:00
diff --git a/core/src/main/java/fj/data/List.java b/core/src/main/java/fj/data/List.java
@@ -943,7 +943,7 @@ public final List<A> sort(final Ord<A> o) {
     else if (tail().isEmpty())
       return this;
     else {
-      final class Merge<A> {
+      final class Merge {
         List<A> merge(List<A> xs, List<A> ys, final Ord<A> o) {
           final Buffer<A> buf = empty();
 
@@ -975,7 +975,7 @@ List<A> merge(List<A> xs, List<A> ys, final Ord<A> o) {
       }
 
       final P2<List<A>, List<A>> s = splitAt(length() / 2);
-      return new Merge<A>().merge(s._1().sort(o), s._2().sort(o), o);
+      return new Merge().merge(s._1().sort(o), s._2().sort(o), o);
     }
   }
 
diff --git a/quickcheck/src/main/java/fj/test/Gen.java b/quickcheck/src/main/java/fj/test/Gen.java
@@ -409,7 +409,7 @@ public static <A> Gen<A> join(final Gen<Gen<A>> g) {
    */
   public static <A> Gen<A> frequency(final List<P2<Integer, Gen<A>>> gs) {
     final class Pick {
-      <A> Gen<A> pick(final int n, final List<P2<Integer, Gen<A>>> gs) {
+      Gen<A> pick(final int n, final List<P2<Integer, Gen<A>>> gs) {
         if(gs.isEmpty())
           return fail();
         else {
@@ -421,7 +421,7 @@ <A> Gen<A> pick(final int n, final List<P2<Integer, Gen<A>>> gs) {
 
     final F<P2<Integer, Gen<A>>, Integer> f = __1();
 
-    return choose(1, intAdditionMonoid.sumLeft(gs.map(f))).bind(i -> new Pick().pick(i, gs));
+    return choose(1, intAdditionMonoid.sumLeft(gs.map(f))).bind(i ->  new Pick().pick(i, gs));
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -943,7 +943,7 @@ public final List<A> sort(final Ord<A> o) {`
`943`	`943`	`else if (tail().isEmpty())`
`944`	`944`	`return this;`
`945`	`945`	`else {`
`946`		`- final class Merge<A> {`
	`946`	`+ final class Merge {`
`947`	`947`	`List<A> merge(List<A> xs, List<A> ys, final Ord<A> o) {`
`948`	`948`	`final Buffer<A> buf = empty();`
`949`	`949`
`@@ -975,7 +975,7 @@ List<A> merge(List<A> xs, List<A> ys, final Ord<A> o) {`
`975`	`975`	`}`
`976`	`976`
`977`	`977`	`final P2<List<A>, List<A>> s = splitAt(length() / 2);`
`978`		`- return new Merge<A>().merge(s._1().sort(o), s._2().sort(o), o);`
	`978`	`+ return new Merge().merge(s._1().sort(o), s._2().sort(o), o);`
`979`	`979`	`}`
`980`	`980`	`}`
`981`	`981`