Editorial: various nits and more <div algorithm> wrappers

- Fix unused variables in report timing and extract full timing info.
- Fix an unclosed tag in extract full timing info.
- Use non-null more consistently.

Related to #1526.

Fixes #1566.

Co-authored-by: Anne van Kesteren <[email protected]>

Author: dlrobertson

fetch.bs

@@ -237,36 +237,45 @@ lt="authentication entry">authentication entries</a> (for HTTP authentication).
  <dd>Null or an algorithm accepting nothing.
 </dl>
 
+<div algorithm>
 <p>To <dfn export for="fetch controller" id="finalize-and-report-timing">report timing</dfn> for a
 <a>fetch controller</a> <var>controller</var> given a <a for=/>global object</a> <var>global</var>:
 
 <ol>
- <li><p><a for=/>Assert</a>: <a>this</a>'s <a for="fetch controller">report timing steps</a> is not
- null.
+ <li><p><a for=/>Assert</a>: <var>controller</var>'s
+ <a for="fetch controller">report timing steps</a> is non-null.
 
- <li><p>Call <a>this</a>'s <a for="fetch controller">report timing steps</a> with <var>global</var>.
+ <li><p>Call <var>controller</var>'s <a for="fetch controller">report timing steps</a> with
+ <var>global</var>.
 </ol>
+</div>
 
+<div algorithm>
 <p>To <dfn export for="fetch controller">process the next manual redirect</dfn> for a
 <a>fetch controller</a> <var>controller</var>:
 
 <ol>
  <li><p><a for=/>Assert</a>: <var>controller</var>'s
- <a for="fetch controller">next manual redirect steps</a> are not null.
+ <a for="fetch controller">next manual redirect steps</a> is non-null.
 
  <li><p>Call <var>controller</var>'s <a for="fetch controller">next manual redirect steps</a>.
 </ol>
+</div>
 
-<p>To <dfn export for="fetch controller" id="extract-full-timing-info">extract full timing info</a>
+<div algorithm>
+<p>To
+<dfn export for="fetch controller" id="extract-full-timing-info">extract full timing info</dfn>
 given a <a>fetch controller</a> <var>controller</var>:
 
 <ol>
- <li><p><a for=/>Assert</a>: <a>this</a>'s <a for="fetch controller">full timing info</a> is not
- null.
+ <li><p><a for=/>Assert</a>: <var>controller</var>'s <a for="fetch controller">full timing info</a>
+ is non-null.
 
- <li><p>Return <a>this</a>'s <a for="fetch controller">full timing info</a>.
+ <li><p>Return <var>controller</var>'s <a for="fetch controller">full timing info</a>.
 </ol>
+</div>
 
+<div algorithm>
 <p>To <dfn export for="fetch controller">abort</dfn> a <a for=/>fetch controller</a>
 <var>controller</var> with an optional <var>error</var>:
 
@@ -284,7 +293,9 @@ given a <a>fetch controller</a> <var>controller</var>:
  <li><p>Set <var>controller</var>'s <a for="fetch controller">serialized abort reason</a> to
  <var>serializedError</var>.
 </ol>
+</div>
 
+<div algorithm>
 <p>To <dfn>deserialize a serialized abort reason</dfn>, given null or a <a>Record</a>
 <var>abortReason</var> and a <a>realm</a> <var>realm</var>:
 
@@ -299,10 +310,13 @@ given a <a>fetch controller</a> <var>controller</var>:
 
  <li><p>Return <var>deserializedError</var>.
 </ol>
+</div>
 
+<div algorithm>
 <p>To <dfn export for="fetch controller">terminate</dfn> a <a for=/>fetch controller</a>
 <var>controller</var>, set <var>controller</var>'s <a for="fetch controller">state</a> to
 "<code>terminated</code>".
+</div>
 
 <p>A <a for=/>fetch params</a> <var>fetchParams</var> is <dfn for="fetch params">aborted</dfn> if
 its <a for="fetch params">controller</a>'s <a for="fetch controller">state</a> is
@@ -348,13 +362,16 @@ following <a for=struct>items</a>: [[RESOURCE-TIMING]] [[NAVIGATION-TIMING]]
  <dd>A number.
 </dl>
 
+<div algorithm>
 <p>To
 <dfn export lt="create an opaque timing info|creating an opaque timing info">create an opaque timing info</dfn>,
 given a <a for=/>fetch timing info</a> <var>timingInfo</var>, return a new
 <a for=/>fetch timing info</a> whose <a for="fetch timing info">start time</a> and
 <a for="fetch timing info">post-redirect start time</a> are <var>timingInfo</var>'s
 <a for="fetch timing info">start time</a>.
+</div>
 
+<div algorithm>
 <p>To <dfn>queue a fetch task</dfn>, given an algorithm <var>algorithm</var>, a
 <a for=/>global object</a> or a <a for=/>parallel queue</a> <var>taskDestination</var>, run these
 steps:
@@ -367,6 +384,7 @@ steps:
  <li><p>Otherwise, <a>queue a global task</a> on the <a>networking task source</a> with
  <var>taskDestination</var> and <var>algorithm</var>.
 </ol>
+</div>
 
 <hr>
 
@@ -419,6 +437,7 @@ preferred. Unlike <a>ASCII whitespace</a> this excludes U+000C FF.
 <p>An <dfn export>HTTP whitespace byte</dfn> is an <a>HTTP newline byte</a> or
 <a>HTTP tab or space byte</a>.
 
+<div algorithm>
 <p>To
 <dfn export lt="collect an HTTP quoted string|collecting an HTTP quoted string">collect an HTTP quoted string</dfn>
 from a <a for=/>string</a> <var>input</var>, given a <a>position variable</a> <var>position</var>
@@ -502,6 +521,7 @@ and optionally an <var>extract-value flag</var>, run these steps:
  </table>
  <p class=tablenote><small>The <a>position variable</a> always starts at 0 in these examples.</small>
 </div>
+</div>
 
 
 <h4 id=methods>Methods</h4>
@@ -850,9 +870,8 @@ directly. Use <a for="header list">get, decode, and split</a> instead.
 </div>
 
 <div algorithm>
-<p>To
-<dfn export for="header list" id=concept-header-list-sort-and-combine>sort and combine</dfn>
-a <a for=/>header list</a> <var>list</var>, run these steps:
+<p>To <dfn export for="header list" id=concept-header-list-sort-and-combine>sort and combine</dfn> a
+<a for=/>header list</a> <var>list</var>:
 
 <ol>
  <li><p>Let <var>headers</var> be an empty <a for=/>list</a> of <a for=/>headers</a> with the key
@@ -869,7 +888,7 @@ a <a for=/>header list</a> <var>list</var>, run these steps:
    <li><p>Let <var>value</var> be the result of <a for="header list">getting</a> <var>name</var>
    from <var>list</var>.
 
-   <li><p>Assert: <var>value</var> is not null.
+   <li><p>Assert: <var>value</var> is non-null.
 
    <li><p><a for=list>Append</a> (<var>name</var>, <var>value</var>) to <var>headers</var>.
   </ol>
@@ -2639,7 +2658,7 @@ functionality.
 <p>When a <a for=fetch>fetch group</a> is
 <dfn export for="fetch group" id=concept-fetch-group-terminate>terminated</dfn>, for each associated
 <a for="fetch group">fetch record</a> whose <a for="fetch group">fetch record</a>'s
-<a for="fetch record">controller</a> is not null, and whose <a for="fetch record">request</a>'s
+<a for="fetch record">controller</a> is non-null, and whose <a for="fetch record">request</a>'s
 <a>done flag</a> is unset or <a for=request>keepalive</a> is false,
 <a for="fetch controller">terminate</a> the <a for="fetch group">fetch record</a>'s
 <a for="fetch record">controller</a>.
@@ -4171,7 +4190,7 @@ the request.
    <li><p><var>request</var>'s <a for=request>mode</a> is "<code>same-origin</code>",
    "<code>cors</code>", or "<code>no-cors</code>"
 
-   <li><p><var>request</var>'s <a for=request>window</a> is not null
+   <li><p><var>request</var>'s <a for=request>window</a> is non-null
 
    <li><p><var>request</var>'s <a for=request>method</a> is `<code>GET</code>`
 
@@ -4348,7 +4367,7 @@ steps:
   corresponding to the first matching statement:
 
   <dl class=switch>
-   <dt><var>fetchParams</var>'s <a for="fetch params">preloaded response candidate</a> is not null
+   <dt><var>fetchParams</var>'s <a for="fetch params">preloaded response candidate</a> is non-null
    <dd>
     <ol>
      <li><p>Wait until <var>fetchParams</var>'s
@@ -4453,7 +4472,7 @@ steps:
      <a for=response>header list</a>.
 
      <li>
-      <p>Otherwise, if <var>headerNames</var> is not null or failure, then set <var>response</var>'s
+      <p>Otherwise, if <var>headerNames</var> is non-null or failure, then set <var>response</var>'s
       <a for=response>CORS-exposed header-name list</a> to <var>headerNames</var>.
 
       <p class="note">One of the <var>headerNames</var> can still be `<code>*</code>` at this point,
@@ -4637,7 +4656,7 @@ steps:
      <var>response</var>'s <a for=response>status</a>.
 
      <li><p>If <var>fetchParams</var>'s <a for="fetch params">request</a>'s
-     <a for=request>initiator type</a> is not null, then
+     <a for=request>initiator type</a> is non-null, then
      <a for=/>mark resource timing</a> given <var>timingInfo</var>, <var>request</var>'s
      <a for=request>URL</a>, <a for="fetch params">request</a>'s
      <a for=request>initiator type</a>, <var>global</var>, <var>cacheState</var>,
@@ -4878,7 +4897,7 @@ these steps:
    <a for="fetch params">cross-origin isolated capability</a>. [[!HTML]] [[!SW]]
 
    <li>
-    <p>If <var>response</var> is not null, then:
+    <p>If <var>response</var> is non-null, then:
 
     <ol>
      <li><p>Set <var>fetchParams</var>'s <a for="fetch params">timing info</a>'s
@@ -4993,7 +5012,7 @@ these steps:
   <ol>
    <li>
     <p>If <var>actualResponse</var>'s <a for=response>status</a> is not 303, <var>request</var>'s
-    <a for=request>body</a> is not null, and the <a>connection</a> uses HTTP/2, then user agents
+    <a for=request>body</a> is non-null, and the <a>connection</a> uses HTTP/2, then user agents
     may, and are even encouraged to, transmit an <code>RST_STREAM</code> frame.
 
     <p class=note>303 is excluded as certain communities ascribe special status to it.
@@ -7472,7 +7491,7 @@ constructor steps are:
  <li><p>Set <a>this</a>'s <a for=Request>signal</a> to a <a for=/>new</a> {{AbortSignal}} object
  with <a>this</a>'s <a>relevant Realm</a>.
 
- <li><p>If <var>signal</var> is not null, then make <a>this</a>'s <a for=Request>signal</a>
+ <li><p>If <var>signal</var> is non-null, then make <a>this</a>'s <a for=Request>signal</a>
  <a for=AbortSignal>follow</a> <var>signal</var>.
 
  <li><p>Set <a>this</a>'s <a for=Request>headers</a> to a <a for=/>new</a> {{Headers}} object with
@@ -8352,8 +8371,8 @@ in a <a for=/>parallel queue</a> if <a for=fetch><i>useParallelQueue</i></a> is
   <p>If the <a for=/>request</a>'s <a for=request>mode</a> is "<code>navigate</code>" and its
   <a for=request>redirect mode</a> is "<code>manual</code>", then callers need to follow a very
   specific flow with this algorithm to get the intended behavior. They should compute the
-  appropriate <a for=response>location URL</a>, and if it is not null or a failure, then they
-  should call <a for="fetch controller">process the next manual redirect</a>. This will result in
+  appropriate <a for=response>location URL</a>, and if it is non-null or failure, then they should
+  call <a for="fetch controller">process the next manual redirect</a>. This will result in
   <a for=fetch><i>processResponse</i></a> being called again, with the next <a for=/>response</a>
   in the redirect chain.