[Git][ghc/ghc][wip/marge_bot_batch_merge_job] 2 commits: hadrian: Don't quote metric baseline argument

[Marge Bot]

 Marge Bot pushed to branch wip/marge_bot_batch_merge_job at Glasgow Haskell Compiler / GHC


Commits:
499ed7ac by Ben Gamari at 2020-10-28T15:11:33-04:00
hadrian: Don't quote metric baseline argument

Previously this was quoted inappropriately.
- - - - -
544b3964 by Alan Zimmerman at 2020-10-28T15:11:33-04:00
API Annotations: put constructors in alphabetical order

- - - - -


2 changed files:

- compiler/GHC/Parser/Annotation.hs
- hadrian/src/Settings/Builders/RunTest.hs


Changes:

=====================================
compiler/GHC/Parser/Annotation.hs
=====================================
@@ -301,7 +301,6 @@ data AnnKeywordId
     | AnnMdo
     | AnnMinus -- ^ '-'
     | AnnModule
-    | AnnPercentOne -- ^ '%1' -- for HsLinearArrow
     | AnnNewtype
     | AnnName -- ^ where a name loses its location in the AST, this carries it
     | AnnOf
@@ -318,7 +317,8 @@ data AnnKeywordId
     | AnnDollarDollar    -- ^ prefix '$$'  -- TemplateHaskell
     | AnnPackageName
     | AnnPattern
-    | AnnPercent -- ^ '%' -- for HsExplicitMult
+    | AnnPercent    -- ^ '%'  -- for HsExplicitMult
+    | AnnPercentOne -- ^ '%1' -- for HsLinearArrow
     | AnnProc
     | AnnQualified
     | AnnRarrow -- ^ '->'


=====================================
hadrian/src/Settings/Builders/RunTest.hs
=====================================
@@ -140,7 +140,7 @@ runTestBuilderArgs = builder RunTest ? do
             , arg "--config", arg $ "stats_files_dir=" ++ statsFilesDir
             , arg $ "--threads=" ++ show threads
             , case perfBaseline of
-                Just commit | not (null commit) -> arg ("--perf-baseline=" ++ show commit)
+                Just commit | not (null commit) -> arg ("--perf-baseline=" ++ commit)
                 _ -> mempty
             , emitWhenSet testEnv $ \env -> arg ("--test-env=" ++ env)
             , emitWhenSet testMetricsFile $ \file -> arg ("--metrics-file=" ++ file)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b159d5b97f5eedecfb0dfcb241a9da54ec8c175d...544b39641eb76af76fbfddbdc02fbf1f4e49b74b

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/b159d5b97f5eedecfb0dfcb241a9da54ec8c175d...544b39641eb76af76fbfddbdc02fbf1f4e49b74b
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201028/c0cb2ff1/attachment-0001.html>