Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

2 changed files:

Changes:

  • compiler/GHC/Unit/Module/Deps.hs
    ... ... @@ -96,7 +96,7 @@ data Dependencies = Deps
    96 96
        , dep_boot_mods_ :: Set (UnitId, ModuleNameWithIsBoot)
    
    97 97
           -- ^ All modules which have boot files below this one, and whether we
    
    98 98
           -- should use the boot file or not.
    
    99
    -      -- This information is only used to populate the eps_is_boot field.
    
    99
    +      -- This information is only used to populate the 'eps_is_boot' field.
    
    100 100
           -- See Note [Structure of dep_boot_mods]
    
    101 101
     
    
    102 102
        , dep_orphs_ :: [Module]
    
    ... ... @@ -605,7 +605,7 @@ hash of the module. The export hash is computed in `GHC.Iface.Recomp.addFingerpr
    605 605
     -}
    
    606 606
     
    
    607 607
     {-
    
    608
    -Note [Structure of dep_boot_deps]
    
    608
    +Note [Structure of dep_boot_mods]
    
    609 609
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    
    610 610
     
    
    611 611
     In `-c` mode we always need to know whether to load the normal or boot version of
    

  • testsuite/tests/linters/notes.stdout
    ... ... @@ -27,7 +27,6 @@ ref compiler/GHC/Tc/Solver/Rewrite.hs:1020:7: Note [Stability of rewritin
    27 27
     ref    compiler/GHC/Tc/TyCl.hs:1662:6:     Note [Unification variables need fresh Names]
    
    28 28
     ref    compiler/GHC/Tc/Types/Constraint.hs:209:9:     Note [NonCanonical Semantics]
    
    29 29
     ref    compiler/GHC/Types/Demand.hs:304:25:     Note [Preserving Boxity of results is rarely a win]
    
    30
    -ref    compiler/GHC/Unit/Module/Deps.hs:97:13:     Note [Structure of dep_boot_mods]
    
    31 30
     ref    compiler/GHC/Utils/Monad.hs:415:34:     Note [multiShotIO]
    
    32 31
     ref    compiler/Language/Haskell/Syntax/Binds.hs:206:31:     Note [fun_id in Match]
    
    33 32
     ref    configure.ac:205:10:     Note [Linking ghc-bin against threaded stage0 RTS]