<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Marge Bot pushed to branch master
at <a href="https://gitlab.haskell.org/ghc/ghc">Glasgow Haskell Compiler / GHC</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.haskell.org/ghc/ghc/commit/7e0451c6ce78b08b5f7564aa03a9a86051b35163">7e0451c6</a></strong>
<div>
<span>by Sergej Jaskiewicz</span>
<i>at 2020-03-21T00:44:55Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Fix event message in withTiming'
This typo caused generating 'end' events without the corresponding 'begin' events.
</pre>
</li>
</ul>
<h4>1 changed file:</h4>
<ul>
<li class="file-stats">
<a href="#033a4b0a0dd5b2de8e407e7ee840e7bd5d90a25e">
compiler/main/ErrUtils.hs
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="033a4b0a0dd5b2de8e407e7ee840e7bd5d90a25e">
<a href="https://gitlab.haskell.org/ghc/ghc/commit/7e0451c6ce78b08b5f7564aa03a9a86051b35163#033a4b0a0dd5b2de8e407e7ee840e7bd5d90a25e"><strong>compiler/main/ErrUtils.hs</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="764" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="764" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -764,7 +764,7 @@ withTiming' dflags what force_result prtimings action</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="764" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
764
</td>
<td class="diff-line-num new_line" data-linenumber="764" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
764
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC764" class="line" lang="haskell"> <span class="kr" style="font-weight: 600;">where</span> <span class="n" style="color: #333;">whenPrintTimings</span> <span class="o" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">liftIO</span> <span class="o" style="font-weight: 600;">.</span> <span class="n" style="color: #333;">when</span> <span class="p">(</span><span class="n" style="color: #333;">prtimings</span> <span class="o" style="font-weight: 600;">==</span> <span class="kt" style="color: #458; font-weight: 600;">PrintTimings</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="765" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
765
</td>
<td class="diff-line-num new_line" data-linenumber="765" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
765
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC765" class="line" lang="haskell"> <span class="n" style="color: #333;">eventBegins</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span> <span class="o" style="font-weight: 600;">=</span> <span class="kr" style="font-weight: 600;">do</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="766" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
766
</td>
<td class="diff-line-num new_line" data-linenumber="766" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
766
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC766" class="line" lang="haskell"> <span class="n" style="color: #333;">whenPrintTimings</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">traceMarkerIO</span> <span class="p">(</span><span class="n" style="color: #333;">eventBeginsDoc</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="767" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
767
</td>
<td class="diff-line-num new_line old" data-linenumber="767" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC767" class="line" lang="haskell"> <span class="n" style="color: #333;">liftIO</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">traceEventIO</span> <span class="p">(</span><span class="n" style="color: #333;">event<span class="idiff left right">End</span>sDoc</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="768" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="767" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
767
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC767" class="line" lang="haskell"> <span class="n" style="color: #333;">liftIO</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">traceEventIO</span> <span class="p">(</span><span class="n" style="color: #333;">event<span class="idiff left right">Begin</span>sDoc</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="768" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
768
</td>
<td class="diff-line-num new_line" data-linenumber="768" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
768
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC768" class="line" lang="haskell"> <span class="n" style="color: #333;">eventEnds</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span> <span class="o" style="font-weight: 600;">=</span> <span class="kr" style="font-weight: 600;">do</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="769" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
769
</td>
<td class="diff-line-num new_line" data-linenumber="769" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
769
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC769" class="line" lang="haskell"> <span class="n" style="color: #333;">whenPrintTimings</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">traceMarkerIO</span> <span class="p">(</span><span class="n" style="color: #333;">eventEndsDoc</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span><span class="p">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="770" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
770
</td>
<td class="diff-line-num new_line" data-linenumber="770" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
770
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC770" class="line" lang="haskell"> <span class="n" style="color: #333;">liftIO</span> <span class="o" style="font-weight: 600;">$</span> <span class="n" style="color: #333;">traceEventIO</span> <span class="p">(</span><span class="n" style="color: #333;">eventEndsDoc</span> <span class="n" style="color: #333;">dflags</span> <span class="n" style="color: #333;">w</span><span class="p">)</span></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://gitlab.haskell.org/ghc/ghc/commit/7e0451c6ce78b08b5f7564aa03a9a86051b35163">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.haskell.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://gitlab.haskell.org/ghc/ghc/commit/7e0451c6ce78b08b5f7564aa03a9a86051b35163"}}</script>
</p>
</div>
</body>
</html>