undo renaming

quasilord · quasilord · commit 4fb433693698 · 2014-10-18T17:07:34.000+01:00
diff --git a/FSharpx.Core.Tests/OptionTests.fs b/FSharpx.Core.Tests/OptionTests.fs
@@ -1,11 +1,11 @@
-﻿namespace FSharpx.Functional.Tests
+﻿namespace FSharpx.Tests
 
 open System
 open System.Threading
 open System.Threading.Tasks
 
 open FSharpx.Core
-open FSharpx.Functional
+open FSharpx
 
 open FsUnit
 open NUnit.Framework 
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -2,7 +2,7 @@
 * Remove the WebClient extension method that has long ago been moved to FSharp.Core
 
 ### 1.9.3 - Cleanup namespaces
-* FSharpx.* types and operators are now in FSharpx.Functional
+* FSharpx.* types and operators are now in FSharpx
 * FSharpx.Regex are now in FSharpx.Text.Regex
 * FSharpx.Strings is now in FSharpx.Text.Strings
 * Microsoft.FSharp.Control has been renamed to FSharpx.Control
diff --git a/docs/content/UndoSample.fsx b/docs/content/UndoSample.fsx
@@ -1,7 +1,7 @@
 ﻿#r @"../../bin/v4.0/FSharpx.Core.dll"
 
 open System
-open FSharpx.Functional.Undo
+open FSharpx.Undo
 
 module Sample =
     let rec handleInput<'a> = undoable {         
diff --git a/docs/content/index.fsx b/docs/content/index.fsx
@@ -37,7 +37,7 @@ These are some adhoc components which are now rarely used:
 #r "FSharpx.Collections.dll"
 #r "FSharpx.Core.dll"
 
-open FSharpx.Functional
+open FSharpx
 
 open FSharpx.Collections
 
diff --git a/src/FSharpx.Core/AsyncOperations.fs b/src/FSharpx.Core/AsyncOperations.fs
@@ -6,7 +6,7 @@ namespace FSharpx.Control
 
     open System
     open System.Threading
-    open FSharpx.Functional
+    open FSharpx
 
     /// Represents the reified result of an asynchronous computation
     [<NoEquality; NoComparison>]
diff --git a/src/FSharpx.Core/CSharpCompat.fs b/src/FSharpx.Core/CSharpCompat.fs
@@ -7,7 +7,7 @@ open System.Collections.Generic
 open System.Runtime.CompilerServices
 open FSharpx.Control.StreamReaderExtensions
 open FSharpx.Collections
-open FSharpx.Functional
+open FSharpx
 
 
 [<assembly:Extension>]
diff --git a/src/FSharpx.Core/ComputationExpressions/Continuation.fs b/src/FSharpx.Core/ComputationExpressions/Continuation.fs
@@ -1,4 +1,4 @@
-﻿namespace FSharpx.Functional
+﻿namespace FSharpx
 
 open System
 open System.Collections.Generic
@@ -52,7 +52,7 @@ module Continuation =
                 (fun enum -> this.While((fun () -> enum.MoveNext()), this.Delay(fun () -> body enum.Current))))
     let cont = ContinuationBuilder()
     
-    open FSharpx.Functional.Operators
+    open FSharpx.Operators
     
     /// Inject a value into the Cont type
     let inline returnM x = returnM cont x
diff --git a/src/FSharpx.Core/ComputationExpressions/Enumerator.fs b/src/FSharpx.Core/ComputationExpressions/Enumerator.fs
@@ -1,4 +1,4 @@
-namespace FSharpx.Functional
+namespace FSharpx
 
 open System
 open System.Collections
diff --git a/src/FSharpx.Core/ComputationExpressions/Monad.fs b/src/FSharpx.Core/ComputationExpressions/Monad.fs
@@ -1,5 +1,5 @@
 ﻿
-namespace FSharpx.Functional
+namespace FSharpx
 #nowarn "40"
 
 open System
@@ -610,7 +610,7 @@ module Undo =
             return true }
 
 module Writer =
-    open FSharpx.Functional.Monoid
+    open FSharpx.Monoid
         
     type Writer<'W, 'T> = unit -> 'T * 'W
 
diff --git a/src/FSharpx.Core/Iteratee.fs b/src/FSharpx.Core/Iteratee.fs
@@ -1,4 +1,4 @@
-﻿namespace FSharpx.Functional
+﻿namespace FSharpx
 #nowarn "40"
 
 open System
diff --git a/src/FSharpx.Core/Lens.fs b/src/FSharpx.Core/Lens.fs
@@ -1,4 +1,4 @@
-﻿namespace FSharpx.Functional
+﻿namespace FSharpx
 
 open FSharpx.Collections
 
diff --git a/src/FSharpx.Core/Monoid.fs b/src/FSharpx.Core/Monoid.fs
@@ -1,4 +1,4 @@
-﻿namespace FSharpx.Functional
+﻿namespace FSharpx
 
 /// Semigroup (set with associative binary operation)
 type ISemigroup<'T> =
@@ -126,7 +126,7 @@ namespace FSharpx.Collections
     open System.Collections
     open System.Collections.Generic
     open System.Runtime.CompilerServices
-    open FSharpx.Functional
+    open FSharpx
             
     module Seq =
 
diff --git a/src/FSharpx.Core/Prelude.fs b/src/FSharpx.Core/Prelude.fs
@@ -1,4 +1,4 @@
-﻿namespace FSharpx.Functional
+﻿namespace FSharpx
 
 open System
 open System.Globalization
diff --git a/tests/FSharpx.CSharpTests/OptionTests.cs b/tests/FSharpx.CSharpTests/OptionTests.cs
@@ -4,7 +4,7 @@
 using NUnit.Framework;
 using Microsoft.FSharp.Collections;
 
-namespace FSharpx.Functional.CSharpTests {
+namespace FSharpx.CSharpTests {
     [TestFixture]
     public class OptionTests {
         [Test]
diff --git a/tests/FSharpx.Tests/AsyncOperatorsTest.fs b/tests/FSharpx.Tests/AsyncOperatorsTest.fs
@@ -3,8 +3,8 @@
 
 module FSharpx.Tests.AsyncOperatorsTest
 
-open FSharpx.Functional
-open FSharpx.Functional.Async
+open FSharpx
+open FSharpx.Async
 open FSharpx.Control
 open NUnit.Framework
 open FsUnit
diff --git a/tests/FSharpx.Tests/BinaryIterateeTest.fs b/tests/FSharpx.Tests/BinaryIterateeTest.fs
@@ -1,11 +1,11 @@
 module FSharpx.Tests.BinaryIterateeTest
 
 open System
-open FSharpx.Functional
+open FSharpx
 open FSharpx.Collections
 open FSharpx.Collections.ByteString
-open FSharpx.Functional.Iteratee
-open FSharpx.Functional.Iteratee.Binary
+open FSharpx.Iteratee
+open FSharpx.Iteratee.Binary
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/ChoiceTests.fs b/tests/FSharpx.Tests/ChoiceTests.fs
@@ -2,7 +2,7 @@
 
 open System
 open NUnit.Framework
-open FSharpx.Functional
+open FSharpx
 open FsUnit
 
 [<Test>]
@@ -63,7 +63,7 @@ let ChoiceFolding() =
         printfn "error: %s" error
         Assert.Fail("should not have failed: {0}", error)
 
-open FSharpx.Functional.Choice
+open FSharpx.Choice
 
 [<Test>]
 let ``computations are aborted on the first Choice2Of2``() = 
diff --git a/tests/FSharpx.Tests/ContinuationTest.fs b/tests/FSharpx.Tests/ContinuationTest.fs
@@ -1,8 +1,8 @@
 ﻿module FSharpx.Tests.ContinuationTest
 
 open System
-open FSharpx.Functional
-open FSharpx.Functional.Continuation
+open FSharpx
+open FSharpx.Continuation
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/FsCheckProperties.fs b/tests/FSharpx.Tests/FsCheckProperties.fs
@@ -1,6 +1,6 @@
 ﻿module FSharpx.Tests.Properties
 
-open FSharpx.Functional
+open FSharpx
 open FSharpx.Collections
 open FsCheck
 open FsCheck.NUnit
@@ -17,7 +17,7 @@ let checkEquality<'a when 'a : equality> name =
         fun (x: 'a) (y: 'a) (z: 'a) ->
             if x = y && y = z then x = z else true
 
-let checkMonoid name (monoid: _ FSharpx.Functional.Monoid) =
+let checkMonoid name (monoid: _ FSharpx.Monoid) =
     let n = sprintf "%s : monoid %s" name
     let mappend = curry monoid.Combine
     let mempty = monoid.Zero()
diff --git a/tests/FSharpx.Tests/FsCheckRunner.fs b/tests/FSharpx.Tests/FsCheckRunner.fs
@@ -1,6 +1,6 @@
 ﻿module FsCheck.NUnit
 
-open FSharpx.Functional
+open FSharpx
 open FsCheck
 open NUnit.Framework
 
diff --git a/tests/FSharpx.Tests/IterateeTest.fs b/tests/FSharpx.Tests/IterateeTest.fs
@@ -1,8 +1,8 @@
 ﻿module FSharpx.Tests.IterateeTest
 
 open System
-open FSharpx.Functional
-open FSharpx.Functional.Iteratee
+open FSharpx
+open FSharpx.Iteratee
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/LensExample.fs b/tests/FSharpx.Tests/LensExample.fs
@@ -2,7 +2,7 @@
 
 // http://stackoverflow.com/questions/8179485/updating-nested-immutable-data-structures
 
-open FSharpx.Functional
+open FSharpx
 open FSharpx.Collections
 
 type Monster = {
@@ -71,7 +71,7 @@ let l2 = { Level.Illumination = 50;  Rooms = [r3; r4] }
 
 let dungeon = { Dungeon.Levels = [l1; l2] }
 
-open FSharpx.Functional.Lens.Operators
+open FSharpx.Lens.Operators
 
 Dungeon.print dungeon
 
diff --git a/tests/FSharpx.Tests/LensTests.fs b/tests/FSharpx.Tests/LensTests.fs
@@ -4,8 +4,8 @@ open System
 open NUnit.Framework
 open FsCheck
 open FsCheck.NUnit
-open FSharpx.Functional
-open FSharpx.Functional.Lens.Operators
+open FSharpx
+open FSharpx.Lens.Operators
 open FSharpx.Text
 
 type Car = {
@@ -102,7 +102,7 @@ let stateMonad() =
     Assert.AreEqual(tom.Salary, r)
     Assert.AreEqual(1100, tom1.Salary)
 
-open FSharpx.Functional.Lens.StateOperators
+open FSharpx.Lens.StateOperators
 
 [<Test>]
 let stateMonadOperators() =
diff --git a/tests/FSharpx.Tests/ListIterateeTest.fs b/tests/FSharpx.Tests/ListIterateeTest.fs
@@ -1,9 +1,9 @@
 module FSharpx.Tests.ListIterateeTest
 
 open System
-open FSharpx.Functional
-open FSharpx.Functional.Iteratee
-open FSharpx.Functional.Iteratee.List
+open FSharpx
+open FSharpx.Iteratee
+open FSharpx.Iteratee.List
 open Microsoft.FSharp.Collections
 open NUnit.Framework
 open FsUnit
diff --git a/tests/FSharpx.Tests/MaybeTest.fs b/tests/FSharpx.Tests/MaybeTest.fs
@@ -1,7 +1,7 @@
 ﻿module FSharpx.Tests.MaybeTest
 
-open FSharpx.Functional
-open FSharpx.Functional.Option
+open FSharpx
+open FSharpx.Option
 open NUnit.Framework
 open FsCheck
 open FsCheck.NUnit
diff --git a/tests/FSharpx.Tests/MonoidTests.fs b/tests/FSharpx.Tests/MonoidTests.fs
@@ -3,10 +3,10 @@
 open NUnit.Framework
 open FsCheck
 open FsCheck.NUnit
-open FSharpx.Functional
+open FSharpx
 open FSharpx.Collections
 open FSharpx.Tests.Properties
-open FSharpx.Functional.Monoid
+open FSharpx.Monoid
 
 type ByteStringGen =
     static member ByteStringArb =
diff --git a/tests/FSharpx.Tests/OperatorsTest.fs b/tests/FSharpx.Tests/OperatorsTest.fs
@@ -1,6 +1,6 @@
 ﻿module FSharp.Monad.Operators.Tests.OperatorsTest
 
-open FSharpx.Functional.Operators
+open FSharpx.Operators
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/OptionTests.fs b/tests/FSharpx.Tests/OptionTests.fs
@@ -2,8 +2,8 @@
 
 open System
 open NUnit.Framework
-open FSharpx.Functional
-open FSharpx.Functional.Option
+open FSharpx
+open FSharpx.Option
 
 [<Test>]
 let ``kleisli composition``() =
diff --git a/tests/FSharpx.Tests/PreludeTests.fs b/tests/FSharpx.Tests/PreludeTests.fs
@@ -3,7 +3,7 @@
 open System
 open System.Globalization
 open System.Threading
-open FSharpx.Functional
+open FSharpx
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/ReaderTest.fs b/tests/FSharpx.Tests/ReaderTest.fs
@@ -2,7 +2,7 @@
 
 open System
 open System.Threading
-open FSharpx.Functional.Reader
+open FSharpx.Reader
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/RegexTests.fs b/tests/FSharpx.Tests/RegexTests.fs
@@ -1,7 +1,7 @@
 module FSharpx.Tests.RegexTests
 
 open FSharpx.Text
-open FSharpx.Functional
+open FSharpx
 open NUnit.Framework
 open System
 open System.Text.RegularExpressions
diff --git a/tests/FSharpx.Tests/StateTest.fs b/tests/FSharpx.Tests/StateTest.fs
@@ -1,6 +1,6 @@
 ﻿module FSharpx.Tests.StateTest
 
-open FSharpx.Functional.State
+open FSharpx.State
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/TaskBuilderTests.fs b/tests/FSharpx.Tests/TaskBuilderTests.fs
@@ -4,7 +4,7 @@ open System
 open System.IO
 open System.Net
 open NUnit.Framework
-open FSharpx.Functional
+open FSharpx
 open System.Threading
 
 #if NET40
diff --git a/tests/FSharpx.Tests/TaskTests.fs b/tests/FSharpx.Tests/TaskTests.fs
@@ -5,7 +5,6 @@ open System.IO
 open System.Net
 open NUnit.Framework
 open FSharpx
-open FSharpx.Functional
 open System.Threading
 
 #if NET40
diff --git a/tests/FSharpx.Tests/UndoTest.fs b/tests/FSharpx.Tests/UndoTest.fs
@@ -1,6 +1,6 @@
 ﻿module FSharpx.Tests.UndoTest
 
-open FSharpx.Functional.Undo
+open FSharpx.Undo
 open NUnit.Framework
 open FsUnit
 
diff --git a/tests/FSharpx.Tests/ValidationExample.fs b/tests/FSharpx.Tests/ValidationExample.fs
@@ -5,10 +5,10 @@
 open NUnit.Framework
 open FsUnit
 
-open FSharpx.Functional
+open FSharpx
 open FSharpx.Collections
-open FSharpx.Functional.Choice
-open FSharpx.Functional.Validation
+open FSharpx.Choice
+open FSharpx.Validation
 
 // First let's define a domain.
 
diff --git a/tests/FSharpx.Tests/ValidationTests.fs b/tests/FSharpx.Tests/ValidationTests.fs
diff --git a/tests/FSharpx.Tests/WriterTest.fs b/tests/FSharpx.Tests/WriterTest.fs
diff --git a/tests/FSharpx.Tests/ZipListTests.fs b/tests/FSharpx.Tests/ZipListTests.fs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace FSharpx.Functional`
	`1`	`+namespace FSharpx`
`2`	`2`
`3`	`3`	`open System`
`4`	`4`	`open System.Collections`