save-analysis: two fixes + rustfmt#45848

bors merged 3 commits intorust-lang:masterrust-lang/rust:masterfrom

nrc:rls-bugs-4nrc/rust:rls-bugs-4Copy head branch name to clipboard