Rollup merge of #151766 - ferrocene:jyn/x-fix, r=jieyouxu

Fix `x fix`, again

This was refactored incorrectly at some point and would run `cargo check` even for `x fix`.