diff options
26 files changed, 39 insertions, 39 deletions
diff --git a/compiler/cmm/CmmLayoutStack.hs b/compiler/cmm/CmmLayoutStack.hs index db3e8c7218..0f8495f3e6 100644 --- a/compiler/cmm/CmmLayoutStack.hs +++ b/compiler/cmm/CmmLayoutStack.hs @@ -1003,7 +1003,7 @@ live across the call. Our job now is to expand the call so we get ... Note the copyOut, which saves the results in the places that L1 is -expecting them (see Note {safe foreign call convention]). Note also +expecting them (see Note [safe foreign call convention]). Note also that safe foreign call is replace by an unsafe one in the Cmm graph. -} diff --git a/compiler/coreSyn/CoreFVs.hs b/compiler/coreSyn/CoreFVs.hs index bab7f5fd41..eba64cdb56 100644 --- a/compiler/coreSyn/CoreFVs.hs +++ b/compiler/coreSyn/CoreFVs.hs @@ -105,7 +105,7 @@ exprFreeVars :: CoreExpr -> VarSet exprFreeVars = fvVarSet . exprFVs -- | Find all locally-defined free Ids or type variables in an expression --- returning a composable FV computation. See Note [FV naming coventions] in FV +-- returning a composable FV computation. See Note [FV naming conventions] in FV -- for why export it. exprFVs :: CoreExpr -> FV exprFVs = filterFV isLocalVar . expr_fvs @@ -150,7 +150,7 @@ exprsFreeVars :: [CoreExpr] -> VarSet exprsFreeVars = fvVarSet . exprsFVs -- | Find all locally-defined free Ids or type variables in several expressions --- returning a composable FV computation. See Note [FV naming coventions] in FV +-- returning a composable FV computation. See Note [FV naming conventions] in FV -- for why export it. exprsFVs :: [CoreExpr] -> FV exprsFVs exprs = mapUnionFV exprFVs exprs diff --git a/compiler/coreSyn/CoreSyn.hs b/compiler/coreSyn/CoreSyn.hs index f8cf6f4dca..2930a24545 100644 --- a/compiler/coreSyn/CoreSyn.hs +++ b/compiler/coreSyn/CoreSyn.hs @@ -1151,7 +1151,7 @@ data CoreRule -- Locality ru_auto :: Bool, -- ^ @True@ <=> this rule is auto-generated -- (notably by Specialise or SpecConstr) - -- @False@ <=> generated at the users behest + -- @False@ <=> generated at the user's behest -- See Note [Trimming auto-rules] in TidyPgm -- for the sole purpose of this field. diff --git a/compiler/hsSyn/Convert.hs b/compiler/hsSyn/Convert.hs index ad4abf89e7..ed1931451b 100644 --- a/compiler/hsSyn/Convert.hs +++ b/compiler/hsSyn/Convert.hs @@ -1690,7 +1690,7 @@ specially in `deSugar/DsMeta.hs`, `hsSyn/Convert.hs`, and The key point is to always represent a pattern synonym's *full* type in cases (a) and (c) to make it clear which of the two forall quantifiers and/or constraint contexts are specified, and which are -not. See GHC's users guide on pattern synonyms for more information +not. See GHC's user's guide on pattern synonyms for more information about pattern synonym type signatures. -} diff --git a/compiler/stranal/WwLib.hs b/compiler/stranal/WwLib.hs index 8b02ba0862..8d41426935 100644 --- a/compiler/stranal/WwLib.hs +++ b/compiler/stranal/WwLib.hs @@ -465,7 +465,7 @@ To avoid this: * We use a fresh unique for both type-variable and term-variable binders Originally we lacked this freshness for type variables, and that led - to the very obscure Trac #12562. (A type varaible in the worker shadowed + to the very obscure Trac #12562. (A type variable in the worker shadowed an outer term-variable binding.) * Because of this cloning we have to substitute in the type/kind of the diff --git a/compiler/typecheck/TcGenFunctor.hs b/compiler/typecheck/TcGenFunctor.hs index 21875ffa5b..0b89ce28ea 100644 --- a/compiler/typecheck/TcGenFunctor.hs +++ b/compiler/typecheck/TcGenFunctor.hs @@ -742,7 +742,7 @@ a is the last type variable in a given datatype): * ft_var: The type is syntactically equal to the last type variable. Moreover, the type appears in a covariant position (see - the Deriving Functor instances section of the users' guide + the Deriving Functor instances section of the user's guide for an in-depth explanation of covariance vs. contravariance). Example: a (covariantly) diff --git a/compiler/typecheck/TcInteract.hs b/compiler/typecheck/TcInteract.hs index 33057cd4fe..13fc0b024d 100644 --- a/compiler/typecheck/TcInteract.hs +++ b/compiler/typecheck/TcInteract.hs @@ -764,7 +764,7 @@ Which, because solving `Eq [a]` demands `Eq a` which we cannot solve, produces: This optimization relies on coherence of dictionaries to be correct. When we cannot assume coherence because of IncoherentInstances then this optimization -can change the behavior of the users code. +can change the behavior of the user's code. The following four modules produce a program whose output would change depending on whether we apply this optimization when IncoherentInstances is in effect: diff --git a/compiler/typecheck/TcSplice.hs b/compiler/typecheck/TcSplice.hs index 15c3aba063..e142cae3b2 100644 --- a/compiler/typecheck/TcSplice.hs +++ b/compiler/typecheck/TcSplice.hs @@ -677,7 +677,7 @@ defaultRunMeta (MetaD r) defaultRunMeta (MetaAW r) = fmap r . runMeta' False (const empty) (const convertAnnotationWrapper) -- We turn off showing the code in meta-level exceptions because doing so exposes - -- the toAnnotationWrapper function that we slap around the users code + -- the toAnnotationWrapper function that we slap around the user's code ---------------- runMetaAW :: LHsExpr Id -- Of type AnnotationWrapper diff --git a/compiler/utils/GraphOps.hs b/compiler/utils/GraphOps.hs index b4b3bd6d8e..0985797571 100644 --- a/compiler/utils/GraphOps.hs +++ b/compiler/utils/GraphOps.hs @@ -567,7 +567,7 @@ validateGraph doc isColored graph , badEdges <- minusUniqSet edges nodes , not $ isEmptyUniqSet badEdges = pprPanic "GraphOps.validateGraph" - ( text "Graph has edges that point to non-existant nodes" + ( text "Graph has edges that point to non-existent nodes" $$ text " bad edges: " <> pprUFM badEdges (vcat . map ppr) $$ doc ) diff --git a/docs/users_guide/conf.py b/docs/users_guide/conf.py index 781b26724a..b48505c8a0 100644 --- a/docs/users_guide/conf.py +++ b/docs/users_guide/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# GHC Users Guide documentation build configuration file +# GHC User's Guide documentation build configuration file # # This file is execfile()d with the current directory set to its # containing dir. @@ -37,8 +37,8 @@ exclude_patterns = ['.build', "*.gen.rst"] # The name for this set of Sphinx documents. If None, it defaults to # "<project> v<release> documentation". -html_title = "Glasgow Haskell Compiler <release> Users Guide" -html_short_title = "GHC %s Users Guide" % release +html_title = "Glasgow Haskell Compiler <release> User's Guide" +html_short_title = "GHC %s User's Guide" % release html_theme_path = ['.'] html_theme = 'ghc-theme' html_logo = None @@ -78,7 +78,7 @@ latex_elements = { # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). latex_documents = [ - ('index', 'users_guide.tex', u'GHC Users Guide Documentation', + ('index', 'users_guide.tex', u'GHC User\'s Guide Documentation', u'GHC Team', 'manual'), ] @@ -108,7 +108,7 @@ man_pages = [ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'GHCUsersGuide', u'GHC Users Guide', + ('index', 'GHCUsersGuide', u'GHC User\'s Guide', u'GHC Team', 'GHCUsersGuide', 'The Glasgow Haskell Compiler.', 'Compilers'), ] diff --git a/docs/users_guide/editing-guide.rst b/docs/users_guide/editing-guide.rst index 6e5036ccbc..b8ba081972 100644 --- a/docs/users_guide/editing-guide.rst +++ b/docs/users_guide/editing-guide.rst @@ -1,5 +1,5 @@ -Care and feeding of your GHC Users Guide -======================================== +Care and feeding of your GHC User's Guide +========================================= The GHC User's Guide is the primary reference documentation for the Glasgow Haskell Compiler. Even more than this, it at times serves (for @@ -157,8 +157,8 @@ language designation, Links ~~~~~ -Within the Users Guide -^^^^^^^^^^^^^^^^^^^^^^ +Within the User's Guide +^^^^^^^^^^^^^^^^^^^^^^^ Frequently we want to give a name to a section so it can be referred to from other points in the document, diff --git a/docs/users_guide/ghc-theme/layout.html b/docs/users_guide/ghc-theme/layout.html index fc5a6a5b54..c2e6739991 100644 --- a/docs/users_guide/ghc-theme/layout.html +++ b/docs/users_guide/ghc-theme/layout.html @@ -11,7 +11,7 @@ {% block relbar1 %} <div class="logo"> - <h1><a href="{{ pathto('index') }}">Glasgow Haskell Compiler Users Guide</a></h1> + <h1><a href="{{ pathto('index') }}">Glasgow Haskell Compiler User's Guide</a></h1> </div> {{ super() }} {% endblock %} diff --git a/docs/users_guide/index.rst b/docs/users_guide/index.rst index 57b04c64a4..bdb6b98e9b 100644 --- a/docs/users_guide/index.rst +++ b/docs/users_guide/index.rst @@ -1,8 +1,8 @@ -.. GHC Users Guide documentation master file, created by +.. GHC User's Guide documentation master file, created by -Welcome to the GHC Users Guide -============================== +Welcome to the GHC User's Guide +=============================== Contents: diff --git a/docs/users_guide/safe_haskell.rst b/docs/users_guide/safe_haskell.rst index 13797ac534..5193f06db8 100644 --- a/docs/users_guide/safe_haskell.rst +++ b/docs/users_guide/safe_haskell.rst @@ -40,7 +40,7 @@ The design of Safe Haskell covers the following aspects: Safe Haskell, however, *does not offer* compilation safety. During compilation time it is possible for arbitrary processes to be launched, using for example the :ref:`custom pre-processor <pre-processor>` flag. -This can be manipulated to either compromise a users system at +This can be manipulated to either compromise a user's system at compilation time, or to modify the source code just before compilation to try to alter Safe Haskell flags. This is discussed further in section :ref:`safe-compilation`. @@ -507,7 +507,7 @@ The reason there are two modes of checking trust is that the extra requirement enabled by :ghc-flag:`-fpackage-trust` causes the design of Safe Haskell to be invasive. Packages using Safe Haskell when the flag is enabled may or may not compile depending on the state of trusted -packages on a users machine. This is both fragile, and causes +packages on a user's machine. This is both fragile, and causes compilation failures for everyone, even if they aren't trying to use any of the guarantees provided by Safe Haskell. Disabling :ghc-flag:`-fpackage-trust` by default and turning it into a flag makes Safe diff --git a/libraries/base/GHC/TypeLits.hs b/libraries/base/GHC/TypeLits.hs index 3981f14b4d..ccfffc3efd 100644 --- a/libraries/base/GHC/TypeLits.hs +++ b/libraries/base/GHC/TypeLits.hs @@ -195,7 +195,7 @@ infixl 6 :<>: -- -- The polymorphic kind of this type allows it to be used in several settings. -- For instance, it can be used as a constraint, e.g. to provide a better error --- message for a non-existant instance, +-- message for a non-existent instance, -- -- @ -- -- in a context diff --git a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs index 00ffbd0042..78c6080bb0 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs @@ -85,7 +85,7 @@ pprPatSynSig nm ty -- | Pretty prints a pattern synonym's type; follows the usual -- conventions to print a pattern synonym type compactly, yet -- unambiguously. See the note on 'PatSynType' and the section on --- pattern synonyms in the GHC users guide for more information. +-- pattern synonyms in the GHC user's guide for more information. pprPatSynType :: PatSynType -> Doc pprPatSynType ty@(ForallT uniTys reqs ty'@(ForallT exTys provs ty'')) | null exTys, null provs = ppr (ForallT uniTys reqs ty'') diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs index b63d692a11..815e3fc5f3 100644 --- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs +++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs @@ -1721,7 +1721,7 @@ data DerivStrategy = StockStrategy -- ^ A \"standard\" derived instance -- 'PatSynSigD' either one of the universals, the existentials, or -- their contexts may be left empty. -- --- See the GHC users guide for more information on pattern synonyms +-- See the GHC user's guide for more information on pattern synonyms -- and their types: https://downloads.haskell.org/~ghc/latest/docs/html/ -- users_guide/syntax-extns.html#pattern-synonyms. type PatSynType = Type diff --git a/mk/get-win32-tarballs.sh b/mk/get-win32-tarballs.sh index 64133decad..839ed0f98e 100755 --- a/mk/get-win32-tarballs.sh +++ b/mk/get-win32-tarballs.sh @@ -122,7 +122,7 @@ usage() { echo "Where <action> is one of," echo " download download the necessary tarballs for the given architecture" echo " fetch download the necessary tarballs for the given architecture but doesn't verify their md5."d - echo " verify verify the existance and correctness of the necessary tarballs" + echo " verify verify the existence and correctness of the necessary tarballs" echo "and <arch> is one of i386, x86_64,all or mirror (which includes sources)" } diff --git a/testsuite/tests/concurrent/prog003/Main.lhs b/testsuite/tests/concurrent/prog003/Main.lhs index e4e8ad790e..8062795bd2 100644 --- a/testsuite/tests/concurrent/prog003/Main.lhs +++ b/testsuite/tests/concurrent/prog003/Main.lhs @@ -209,7 +209,7 @@ just testing > {- > putStrLn "Start" > executeTasks nl $ createTasks [1..len] -> find nl (len+1) -- we try to find a non-existant element +> find nl (len+1) -- we try to find a non-existent element > -- this way, in the LazyList case, we will physically delete all (logically deleted) elements > -} > putStrLn "End" diff --git a/testsuite/tests/concurrent/prog003/MainMVarList.lhs b/testsuite/tests/concurrent/prog003/MainMVarList.lhs index 9bcf9b1240..3ec54cb75d 100644 --- a/testsuite/tests/concurrent/prog003/MainMVarList.lhs +++ b/testsuite/tests/concurrent/prog003/MainMVarList.lhs @@ -230,7 +230,7 @@ just testing > {- > putStrLn "Start" > executeTasks nl $ createTasks [1..len] -> find nl (len+1) -- we try to find a non-existant element +> find nl (len+1) -- we try to find a non-existent element > -- this way, in the LazyList case, we will physically delete all (logically deleted) elements > -} > putStrLn "End" diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T index 580498ff2f..ea285dcf93 100644 --- a/testsuite/tests/plugins/all.T +++ b/testsuite/tests/plugins/all.T @@ -12,7 +12,7 @@ test('plugins02', test('plugins03', [pre_cmd('$MAKE -s --no-print-directory -C simple-plugin package.plugins03 TOP={top}')], compile_fail, - ['-package-db simple-plugin/pkg.plugins03/local.package.conf -fplugin Simple.NonExistantPlugin -package simple-plugin']) + ['-package-db simple-plugin/pkg.plugins03/local.package.conf -fplugin Simple.NonExistentPlugin -package simple-plugin']) test('plugins04', [], multimod_compile_fail, ['plugins04', '-package ghc -fplugin HomePackagePlugin']) diff --git a/testsuite/tests/plugins/plugins03.hs b/testsuite/tests/plugins/plugins03.hs index 7cc679b38f..7857e823f0 100644 --- a/testsuite/tests/plugins/plugins03.hs +++ b/testsuite/tests/plugins/plugins03.hs @@ -1,4 +1,4 @@ --- Just used to test that we correctly handle non-existant plugins +-- Just used to test that we correctly handle non-existent plugins module Main where -- The contents of this file are actually irrelevant diff --git a/testsuite/tests/plugins/plugins03.stderr b/testsuite/tests/plugins/plugins03.stderr index e04d80cb87..c02965ad1f 100644 --- a/testsuite/tests/plugins/plugins03.stderr +++ b/testsuite/tests/plugins/plugins03.stderr @@ -1,2 +1,2 @@ -<command line>: Could not find module ‘Simple.NonExistantPlugin’ +<command line>: Could not find module ‘Simple.NonExistentPlugin’ Use -v to see a list of the files searched for. diff --git a/testsuite/tests/typecheck/should_compile/T6018.hs b/testsuite/tests/typecheck/should_compile/T6018.hs index 91a67c5e57..b3094fe948 100644 --- a/testsuite/tests/typecheck/should_compile/T6018.hs +++ b/testsuite/tests/typecheck/should_compile/T6018.hs @@ -258,7 +258,7 @@ type IdSyn a = Id a type family IdProxySyn (a :: k) b = r | r -> a type instance IdProxySyn a b = (IdSyn a) b --- this has bare variable in the RHS but all LHS varaiables are also bare so it +-- this has bare variable in the RHS but all LHS variables are also bare so it -- should be accepted type family Fa (a :: k) (b :: k) = (r :: k2) | r -> k type instance Fa a b = a diff --git a/utils/mkUserGuidePart/Main.hs b/utils/mkUserGuidePart/Main.hs index 57edc94f65..344c808534 100644 --- a/utils/mkUserGuidePart/Main.hs +++ b/utils/mkUserGuidePart/Main.hs @@ -16,7 +16,7 @@ type ReST = String main :: IO () main = do - -- users guide + -- user's guide writeRestFile (usersGuideFile "what_glasgow_exts_does.gen.rst") $ whatGlasgowExtsDoes forM_ groups $ \(Group name _ theFlags) -> @@ -45,7 +45,7 @@ whatGlasgowExtsDoes = unlines parseExt ext = inlineCode $ "-X" ++ show ext -- | Generate a reference table of the given set of flags. This is used in --- the users guide. +-- the user's guide. flagsTable :: [Flag] -> ReST flagsTable theFlags = table [50, 100, 30, 55] diff --git a/utils/testremove/checkremove.hs b/utils/testremove/checkremove.hs index e22c004794..5d77aee1b4 100644 --- a/utils/testremove/checkremove.hs +++ b/utils/testremove/checkremove.hs @@ -64,8 +64,8 @@ mapFromList' xs = seqAll xs `seq` Map.fromList xs seqAll ((x, y) : xys) = x `seq` y `seq` seqAll xys {- -... = OK: will happen if a file in a non-existant directory is rm'd [1] -..D = OK: will happen if a non-existant file is rm'd [1] +... = OK: will happen if a file in a non-existent directory is rm'd [1] +..D = OK: will happen if a non-existent file is rm'd [1] .A. = suspicious: Why wasn't this file cleaned? .AD = OK: This is what object files look like B.. = suspicious: Where did the file go? |