Rollup merge of #73248 - marmeladema:save-analysis-various-fixes, r=Xanewok
Rollup merge of #73248 - marmeladema:save-analysis-various-fixes, r=Xanewok

save_analysis: improve handling of enum struct variant

Fixes #61385

aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,aidancully/rust,aidancully/rust,graydon/rust,aidancully/rust,graydon/rust,graydon/rust