Rollup merge of #42089 - nagisa:xpy-broke-on-py3-again⁈, r=alexcrichton
Rollup merge of #42089 - nagisa:xpy-broke-on-py3-again⁈, r=alexcrichton

Fix x.py

Fixes https://github.com/rust-lang/rust/issues/42085

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