Skip to content

Commit

Permalink
Rollup merge of rust-lang#115867 - Zalathar:debug, r=oli-obk
Browse files Browse the repository at this point in the history
coverage: Simplify internal representation of debug types

Most of these debug helper types store each of their fields as `Option<T>`, and then set them to `Some` when the relevant debug checks are enabled. This makes the struct fields awkward to read and results in some contortions when accessing the field values.

This PR addresses those problems by changing each of the helper types to have a single `state: Option<FooState>` field. Each individual method can then obtain the state up-front (or return early if it is absent), allowing the rest of the code to just access the state's contents directly.

---

There are some more improvements I'd like to make to the debug code, but for this PR I'm focusing on a straightforward mechanical change that should be fairly easy to review.

(I did thrown in a few trivial changes to imports and docs, along with one switch from `FxHashMap` to `FxHashSet`.)

---

Most of the changed lines are just indentation churn, so ignoring whitespace is recommended.
  • Loading branch information
matthiaskrgr committed Sep 16, 2023
2 parents ab90d70 + 91e0b46 commit 77e0102
Showing 1 changed file with 141 additions and 146 deletions.
Loading

0 comments on commit 77e0102

Please sign in to comment.