Bug 1607697 - Address clippy lints about nested branches. r=Gankro
5930785
Differential Revision: https://phabricator.services.mozilla.com/D59115 [wrupdater] From https://hg.mozilla.org/mozilla-central/rev/6101f5e31e46f6c77198c66e14a56ea2510e7c92
