Auto merge of #45848 - nrc:rls-bugs-4, r=eddyb

save-analysis: two fixes + rustfmt

Fix two regressions and run rustfmt.

r? @eddyb

Author: bors