Skip to content

Commit d055b6b

Browse files
forkiforki
committed
Merge branch 'remove-collections' of https://github.com/quasilord/fsharpx
Conflicts: .travis.yml FSharpx.Core.Tests/OptionTests.fs README.md RELEASE_NOTES.md build.fsx docs/content/UndoSample.fsx docs/content/index.fsx docs/files/img/logo.png docs/tools/generate.fsx src/FSharpx.Core/Agents/Agent.fs src/FSharpx.Core/Agents/AutoCancelAgent.fs src/FSharpx.Core/Agents/BatchProcessingAgent.fs src/FSharpx.Core/Agents/BlockingQueueAgent.fs src/FSharpx.Core/Agents/CircularQueueAgent.fs src/FSharpx.Core/Agents/ConcurrentSetAgent.fs src/FSharpx.Core/Agents/SlidingWindowAgent.fs src/FSharpx.Core/Async.IO.fs src/FSharpx.Core/Async.fs src/FSharpx.Core/AsyncOperations.fs src/FSharpx.Core/AsyncOperations.fsi src/FSharpx.Core/AsyncSeq.fs src/FSharpx.Core/AsyncStreamReader.fs src/FSharpx.Core/AsyncStreamReader.fsi src/FSharpx.Core/AsyncWorker.fs src/FSharpx.Core/AsyncWorker.fsi src/FSharpx.Core/CSharpCompat.fs src/FSharpx.Core/ComputationExpressions/Continuation.fs src/FSharpx.Core/ComputationExpressions/Monad.fs src/FSharpx.Core/Monoid.fs src/FSharpx.Core/Observable.fs tests/FSharpx.Tests/AsyncOperatorsTest.fs tests/FSharpx.Tests/LensTests.fs tests/FSharpx.Tests/RegexTests.fs tests/FSharpx.Tests/ValidationTests.fs
2 parents cd47b7a + c697430 commit d055b6b

17 files changed

Lines changed: 30 additions & 46 deletions

File tree

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ install:
99
- sudo installer -pkg "MonoFramework-MDK-${MONO_VERSION}.macos10.xamarin.x86.pkg" -target /
1010

1111
script:
12+
- chmod u+x ./build.sh
1213
- ./build.sh

‎FSharpx.Core.Tests/OptionTests.fs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
namespace FSharpx.Functional.Tests
1+
namespace FSharpx.Tests
22

33
open System
44
open System.Threading
55
open System.Threading.Tasks
66

77
open FSharpx.Core
8-
open FSharpx.Functional
8+
open FSharpx
99

1010
open FsUnit
1111
open NUnit.Framework
@@ -33,4 +33,4 @@ type ``Option module Extension Tests``() =
3333
[<Test>]
3434
member test.``fromTryPattern using System.Double.TryParse on input "xx" is None``() =
3535
let f = Option.fromTryPattern Double.TryParse
36-
f "xx" |> should equal None
36+
f "xx" |> should equal None

‎RELEASE_NOTES.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
* Remove the WebClient extension method that has long ago been moved to FSharp.Core
33

44
### 1.9.3 - Cleanup namespaces
5-
* FSharpx.* types and operators are now in FSharpx.Functional
5+
* FSharpx.* types and operators are now in FSharpx
66
* FSharpx.Regex are now in FSharpx.Text.Regex
77
* FSharpx.Strings is now in FSharpx.Text.Strings
88
* Microsoft.FSharp.Control has been renamed to FSharpx.Control

‎build.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ let projectDesc = "FSharpx is a library for the .NET platform implementing gener
4545
let rec getPackageDesc = function
4646
| "Http" -> projectDesc + "\r\n\r\nThis library provides common features for working with HTTP applications."
4747
| "Observable" -> projectDesc + "\r\n\r\nThis library implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford."
48-
| "Text.StructuredFormat" -> projectDesc + "\r\n\r\nThis library provides data structures and functions for pretty printers."
48+
| "Text.StructuredFormat" -> projectDesc + "\r\n\r\nThis library provides data structures and functoins for pretty printers."
4949
| _ -> projectDesc + "\r\n\r\nIt currently implements:\r\n\r\n" +
5050
"* Several standard monads: State, Reader, Writer, Either, Continuation, Distribution\r\n" +
5151
"* Validation applicative functor\r\n" +

‎docs/content/UndoSample.fsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#r @"../../bin/v4.0/FSharpx.Core.dll"
22

33
open System
4-
open FSharpx.Functional.Undo
4+
open FSharpx.Undo
55

66
module Sample =
77
let rec handleInput<'a> = undoable {
@@ -18,4 +18,4 @@ module Sample =
1818
printfn "The current total is %O" currentVal
1919
return! handleInput }
2020

21-
Sample.handleInput (newHistory 0.) |> ignore
21+
Sample.handleInput (newHistory 0.) |> ignore

‎docs/content/index.fsx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ These are some adhoc components which are now rarely used:
2929
3030
* FSharpx.Http provides a few features for working with HTTP applications.
3131
* FSharpx.Observable implements a mini-Reactive Extensions (MiniRx) and was authored by Phil Trelford.
32-
* FSharpx.Text.StructuredFormat provides data structures and functoins for pretty printers. Combinators description: https://github.com/fsprojects/fsharpx/blob/master/src/FSharpx.Text.StructuredFormat/StructuredFormat.fsi
32+
* FSharpx.Text.StructuredFormat provides data structures and functoins for pretty printers.
3333
3434
3535
*)
3636

3737
#r "FSharpx.Collections.dll"
3838
#r "FSharpx.Core.dll"
3939

40-
open FSharpx.Functional
40+
open FSharpx
4141

4242
open FSharpx.Collections
4343

@@ -63,7 +63,6 @@ FSharpx.Collections.List.monoid
6363
* [Santa](Santa.html)
6464
* [StmSample](StmSample.html)
6565
* [StockStream](StockStream.html)
66-
* [StructuredFormatSample](StructuredFormatSample.html)
6766
* [UndoSample](UndoSample.html)
6867
* [WebProxy](WebProxy.html)
6968

‎docs/tools/generate.fsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// --------------------------------------------------------------------------------------
1+
// --------------------------------------------------------------------------------------
22
// Builds the documentation from `.fsx` and `.md` files in the 'docs/content' directory
33
// (the generated documentation is stored in the 'docs/output' directory)
44
// --------------------------------------------------------------------------------------

‎src/FSharpx.Core/CSharpCompat.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ open System.Collections.Generic
77
open System.Runtime.CompilerServices
88
open FSharpx.Control.StreamReaderExtensions
99
open FSharpx.Collections
10-
open FSharpx.Functional
10+
open FSharpx
1111

1212

1313
[<assembly:Extension>]

‎src/FSharpx.Core/ComputationExpressions/Continuation.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace FSharpx.Functional
1+
namespace FSharpx
22

33
open System
44
open System.Collections.Generic
@@ -52,7 +52,7 @@ module Continuation =
5252
(fun enum -> this.While((fun () -> enum.MoveNext()), this.Delay(fun () -> body enum.Current))))
5353
let cont = ContinuationBuilder()
5454

55-
open FSharpx.Functional.Operators
55+
open FSharpx.Operators
5656

5757
/// Inject a value into the Cont type
5858
let inline returnM x = returnM cont x

‎src/FSharpx.Core/ComputationExpressions/Monad.fs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
namespace FSharpx.Functional
2+
namespace FSharpx
33
#nowarn "40"
44

55
open System
@@ -610,7 +610,7 @@ module Undo =
610610
return true }
611611

612612
module Writer =
613-
open FSharpx.Functional.Monoid
613+
open FSharpx.Monoid
614614

615615
type Writer<'W, 'T> = unit -> 'T * 'W
616616

0 commit comments

Comments
 (0)