Promote expect tests to new markup structure.

Author: dbuenzli

test/html/expect/test_package+ml/Bugs/index.html

@@ -30,7 +30,7 @@ <h1>
    </div>
    <div class="odoc-spec">
     <div class="spec value" id="val-foo">
-     <a href="#val-foo" class="anchor"></a><code><span><span class="keyword">val</span> foo : <span>?⁠bar:<span class="type-var">'a</span> <span>-&gt;</span></span> <span>unit <span>-&gt;</span></span> unit</span></code>
+     <a href="#val-foo" class="anchor"></a><code><span><span class="keyword">val</span> foo : <span>?⁠bar:<span class="type-var">'a</span> <span class="arrow">-&gt;</span></span> <span>unit <span class="arrow">-&gt;</span></span> unit</span></code>
     </div>
     <div class="spec-doc">
      <p>

test/html/expect/test_package+ml/Bugs_pre_410/index.html

@@ -30,7 +30,7 @@ <h1>
    </div>
    <div class="odoc-spec">
     <div class="spec value" id="val-foo'">
-     <a href="#val-foo'" class="anchor"></a><code><span><span class="keyword">val</span> foo' : <span>?⁠bar:<span class="type-var">'a</span> <span>-&gt;</span></span> <span>unit <span>-&gt;</span></span> unit</span></code>
+     <a href="#val-foo'" class="anchor"></a><code><span><span class="keyword">val</span> foo' : <span>?⁠bar:<span class="type-var">'a</span> <span class="arrow">-&gt;</span></span> <span>unit <span class="arrow">-&gt;</span></span> unit</span></code>
     </div>
     <div class="spec-doc">
      <p>

test/html/expect/test_package+ml/External/index.html

@@ -24,8 +24,8 @@ <h1>
   </header>
   <div class="odoc-content">
    <div class="odoc-spec">
-    <div class="spec external" id="val-foo">
-     <a href="#val-foo" class="anchor"></a><code><span><span class="keyword">val</span> foo : <span>unit <span>-&gt;</span></span> unit</span></code>
+    <div class="spec value external" id="val-foo">
+     <a href="#val-foo" class="anchor"></a><code><span><span class="keyword">val</span> foo : <span>unit <span class="arrow">-&gt;</span></span> unit</span></code>
     </div>
     <div class="spec-doc">
      <p>

test/html/expect/test_package+ml/Functor/index.html

@@ -30,7 +30,7 @@ <h1>
    </div>
    <div class="odoc-spec">
     <div class="spec module-type" id="module-type-S1">
-     <a href="#module-type-S1" class="anchor"></a><code><span><span class="keyword">module</span> <span class="keyword">type</span> </span><span><a href="module-type-S1/index.html">S1</a></span><span> = <span class="keyword">functor</span><span> (<a href="module-type-S1/argument-1-_/index.html">_</a> : <a href="module-type-S/index.html">S</a>) <span>-&gt;</span></span> <a href="module-type-S/index.html">S</a></span></code>
+     <a href="#module-type-S1" class="anchor"></a><code><span><span class="keyword">module</span> <span class="keyword">type</span> </span><span><a href="module-type-S1/index.html">S1</a></span><span> = <span class="keyword">functor</span><span> (<a href="module-type-S1/argument-1-_/index.html">_</a> : <a href="module-type-S/index.html">S</a>) <span class="arrow">-&gt;</span></span> <a href="module-type-S/index.html">S</a></span></code>
     </div>
    </div>
    <div class="odoc-spec">

test/html/expect/test_package+ml/Include2/index.html

@@ -38,12 +38,9 @@ <h1>
      <summary class="spec include">
       <code><span><span class="keyword">include</span> <span class="keyword">module</span> <span class="keyword">type</span> <span class="keyword">of</span> <span class="keyword">struct</span> <span class="keyword">include</span> <a href="X/index.html">X</a> <span class="keyword">end</span></span></code>
      </summary>
-<<<<<<< HEAD
      <p>
       Comment about X that should not appear when including X below.
      </p>
-=======
->>>>>>>  Promote expect tests to new markup structure.
      <div class="odoc-spec">
       <div class="spec type" id="type-t">
        <a href="#type-t" class="anchor"></a><code><span><span class="keyword">type</span> t</span><span> = int</span></code>

test/html/expect/test_package+ml/Labels/index.html

@@ -62,8 +62,8 @@ <h2 id="L2">
     </div>
    </div>
    <div class="odoc-spec">
-    <div class="spec external" id="val-e">
-     <a href="#val-e" class="anchor"></a><code><span><span class="keyword">val</span> e : <span>unit <span>-&gt;</span></span> <a href="#type-t">t</a></span></code>
+    <div class="spec value external" id="val-e">
+     <a href="#val-e" class="anchor"></a><code><span><span class="keyword">val</span> e : <span>unit <span class="arrow">-&gt;</span></span> <a href="#type-t">t</a></span></code>
     </div>
     <div class="spec-doc">
      <p>
@@ -102,7 +102,7 @@ <h2 id="L2">
     </div>
    </div>
    <div class="odoc-spec">
-    <div class="spec extension">
+    <div class="spec type extension">
      <code><span><span class="keyword">type</span> <a href="#type-x">x</a> += </span></code>
      <table>
       <tbody>
@@ -131,7 +131,7 @@ <h2 id="L2">
     </div>
    </div>
    <div class="odoc-spec">
-    <div class="spec type-subst" id="type-s">
+    <div class="spec type subst" id="type-s">
      <a href="#type-s" class="anchor"></a><code><span><span class="keyword">type</span> s</span><span> := <a href="#type-t">t</a></span></code>
     </div>
     <div class="spec-doc">
@@ -149,7 +149,7 @@ <h2 id="L2">
         <td class="def variant constructor">
          <a href="#type-u.A'" class="anchor"></a><code><span>| </span><span><span class="constructor">A'</span></span></code>
         </td>
-        <td class="doc">
+        <td class="def-doc">
          <p>
           Attached to constructor
          </p>
@@ -168,7 +168,7 @@ <h2 id="L2">
         <td class="def record field">
          <a href="#type-v.f" class="anchor"></a><code><span>f : <a href="#type-t">t</a>;</span></code>
         </td>
-        <td class="doc">
+        <td class="def-doc">
          <p>
           Attached to field
          </p>

test/html/expect/test_package+ml/Nested/class-z/index.html

@@ -37,7 +37,7 @@ <h1>
   </nav>
   <div class="odoc-content">
    <div class="odoc-spec">
-    <div class="spec instance-variable" id="val-y">
+    <div class="spec value instance-variable" id="val-y">
      <a href="#val-y" class="anchor"></a><code><span><span class="keyword">val</span> y : int</span></code>
     </div>
     <div class="spec-doc">
@@ -47,7 +47,7 @@ <h1>
     </div>
    </div>
    <div class="odoc-spec">
-    <div class="spec instance-variable" id="val-y'">
+    <div class="spec value instance-variable" id="val-y'">
      <a href="#val-y'" class="anchor"></a><code><span><span class="keyword">val</span> <span class="keyword">mutable</span> <span class="keyword">virtual</span> y' : int</span></code>
     </div>
    </div>