[commit: ghc] master: Comments only (99eb002)

[git at git.haskell.org]

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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/99eb002d0813638be0967bad714d504e26021f5c/ghc

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

commit 99eb002d0813638be0967bad714d504e26021f5c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 09:06:47 2015 +0000

    Comments only


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

99eb002d0813638be0967bad714d504e26021f5c
 libraries/base/Data/String.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/base/Data/String.hs b/libraries/base/Data/String.hs
index df410f0..9e1f5f3 100644
--- a/libraries/base/Data/String.hs
+++ b/libraries/base/Data/String.hs
@@ -35,9 +35,8 @@ import Data.List (lines, words, unlines, unwords)
 class IsString a where
     fromString :: String -> a
 
-{-
-Note [IsString String]
-~~~~~~~~~~~~~~~~~~~~~~
+{- Note [IsString String]
+~~~~~~~~~~~~~~~~~~~~~~~~~
 Previously, the IsString instance that covered String was a flexible
 instance for [Char]. This is in some sense the most accurate choice,
 but there are cases where it can lead to an ambiguity, for instance:
@@ -74,6 +73,8 @@ would be, and it certainly hasn't been implemented.
 A test case (should_run/overloadedstringsrun01.hs) has been added to
 ensure the good behavior of the above example remains in the future.
 -}
+
 instance (a ~ Char) => IsString [a] where
+         -- See Note [IsString String]
     fromString xs = xs