[commit: packages/filepath] master: #49, move the docs from </> to combine, so its all in one place (a479073)

git at git.haskell.org git at git.haskell.org
Mon Dec 28 20:39:42 UTC 2015


Repository : ssh://git@git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/a479073cd0236a811fbf293f063f355962d3289e

>---------------------------------------------------------------

commit a479073cd0236a811fbf293f063f355962d3289e
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:07:21 2015 +0000

    #49, move the docs from </> to combine, so its all in one place


>---------------------------------------------------------------

a479073cd0236a811fbf293f063f355962d3289e
 System/FilePath/Internal.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 1e95d17..c67b0eb 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -606,6 +606,8 @@ replaceDirectory x dir = combineAlways dir (takeFileName x)
 -- | Combine two paths, if the second path starts with a path separator or a
 --   drive letter, then it returns the second.
 --
+-- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
 -- > Valid x => combine (takeDirectory x) (takeFileName x) `equalFilePath` x
 --
 --   Combined:
@@ -654,9 +656,6 @@ combineAlways a b | null a = b
 
 
 -- | Join two values with a path separator. For examples and caveats see the equivalent function 'combine'.
---
--- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
--- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
 (</>) :: FilePath -> FilePath -> FilePath
 (</>) = combine
 



More information about the ghc-commits mailing list