Remove FSharpx.DataStructures.RoseTree which has been obsolete for quite some time now

Author: mausch

src/FSharpx.Collections.Experimental/CSharpCompat.fs

@@ -0,0 +1,29 @@
+namespace FSharpx.Collections.Experimental
+
+open System
+open System.Runtime.CompilerServices
+open FSharpx
+open FSharpx.Collections
+
+[<Extension>]
+type RoseTree =
+    static member Singleton x = RoseTree.singleton x
+    static member Create(root, [<ParamArray>] children) = RoseTree.create root (LazyList.ofArray children)
+    static member Create(root, children) = RoseTree.create root children
+
+    [<Extension>]
+    static member Select(tree, f: Func<_,_>) = RoseTree.map f.Invoke tree
+
+    [<Extension>]
+    static member SelectMany (o, f: Func<_,_>) = RoseTree.bind f.Invoke o
+
+    [<Extension>]
+    static member SelectMany (o, f: Func<_,_>, mapper: Func<_,_,_>) =
+        let mapper = RoseTree.lift2 (curry mapper.Invoke)
+        let v = RoseTree.bind f.Invoke o
+        mapper o v
+
+    [<Extension>]
+    static member SelectAccum (o, state, f: Func<_,_,_>) =
+        let ff = FSharpFunc.FromFunc f
+        RoseTree.mapAccum ff state o

src/FSharpx.Collections.Experimental/FSharpx.Collections.Experimental.fsproj

@@ -52,7 +52,7 @@
     <Compile Include="BatchedDeque.fs" />
     <Compile Include="BatchedQueue.fs" />
     <Compile Include="BinaryRandomAccessList.fs" />
-	<Compile Include="BinaryRoseTree.fs" />
+    <Compile Include="BinaryRoseTree.fs" />
     <Compile Include="BinaryTreeZipper.fs" />
     <Compile Include="BinomialHeap.fs" />
     <Compile Include="IntMap.fs" />
@@ -62,13 +62,13 @@
     <Compile Include="Deque.fs" />
     <Compile Include="DList.fs" />
     <Compile Include="EagerRoseTree.fs" />
-	<Compile Include="FlatList.fsi" />
-	<Compile Include="FlatList.fs" />
+    <Compile Include="FlatList.fsi" />
+    <Compile Include="FlatList.fs" />
     <Compile Include="PairingHeap.fs" />
     <Compile Include="HeapPriorityQueue.fs" />
     <Compile Include="HoodMelvilleQueue.fs" />
     <Compile Include="ImplicitQueue.fs" />
-	<Compile Include="IndexedRoseTree.fs" />
+    <Compile Include="IndexedRoseTree.fs" />
     <Compile Include="LeftistHeap.fs" />
     <Compile Include="ListZipper.fs" />
     <Compile Include="PhysicistQueue.fs" />
@@ -79,6 +79,7 @@
     <Compile Include="SkewBinaryRandomAccessList.fs" />
     <Compile Include="TimeSeries.fs" />
     <Compile Include="Vector.fs" />
+    <Compile Include="CSharpCompat.fs" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="FSharp.Core" Condition="$(TargetFrameworkVersion) == 'v3.5'">

src/FSharpx.Core/CSharpCompat.fs

@@ -532,25 +532,3 @@ type FSharpLazy =
     static member Create (v: _ Func) = Lazy.Create v.Invoke
     static member CreateFromValue v = Lazy.CreateFromValue v
 
-[<Extension>]
-type RoseTree =
-    static member Singleton x = RoseTree.singleton x
-    static member Create(root, [<ParamArray>] children) = RoseTree.create root (LazyList.ofArray children)
-    static member Create(root, children) = RoseTree.create root children
-
-    [<Extension>]
-    static member Select(tree, f: Func<_,_>) = RoseTree.map f.Invoke tree
-
-    [<Extension>]
-    static member SelectMany (o, f: Func<_,_>) = RoseTree.bind f.Invoke o
-
-    [<Extension>]
-    static member SelectMany (o, f: Func<_,_>, mapper: Func<_,_,_>) =
-        let mapper = RoseTree.lift2 (curry mapper.Invoke)
-        let v = RoseTree.bind f.Invoke o
-        mapper o v
-
-    [<Extension>]
-    static member SelectAccum (o, state, f: Func<_,_,_>) =
-        let ff = FSharpFunc.FromFunc f
-        RoseTree.mapAccum ff state o

src/FSharpx.Core/DataStructures/RoseTree.fs

@@ -102,7 +102,6 @@
     <Compile Include="DataStructures\HeapPriorityQueue.fs" />
     <Compile Include="DataStructures\BinaryTreeZipper.fs" />
     <Compile Include="DataStructures\ListZipper.fs" />
-    <Compile Include="DataStructures\RoseTree.fs" />
     <Compile Include="DataStructures\BankersQueue.fs" />
     <Compile Include="DataStructures\BatchedQueue.fs" />
     <Compile Include="DataStructures\PhysicistQueue.fs" />

src/FSharpx.Core/FSharpx.Core.fsproj

@@ -92,6 +92,10 @@
     <Compile Include="ChoiceTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\src\FSharpx.Collections.Experimental\FSharpx.Collections.Experimental.fsproj">
+      <Project>{ad3c8e86-f4cf-426f-a31d-015056227777}</Project>
+      <Name>FSharpx.Collections.Experimental</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\src\FSharpx.Core\FSharpx.Core.fsproj">
       <Project>{1e95a279-c2a9-498b-bc72-6e7a0d6854ce}</Project>
       <Name>FSharpx.Core</Name>
@@ -109,4 +113,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj

@@ -1,8 +1,7 @@
 using System;
 using System.Linq;
 using FSharpx.Collections;
-using FSharpx.DataStructures;
-using Microsoft.FSharp.Collections;
+using FSharpx.Collections.Experimental;
 using NUnit.Framework;
 
 namespace FSharpx.CSharpTests {