Unrolled build for rust-lang#116754

Rollup merge of rust-lang#116754 - Zalathar:spans, r=oli-obk

coverage: Several small cleanups in `spans`

While investigating the details of coverage span processing, I noticed several opportunities to make the code simpler and clearer.

---

`@rustbot` label +A-code-coverage