Rollup merge of #123721 - madsmtm:fix-visionos, r=davidtwco

Various visionOS fixes

A few small mistakes was introduced in rust-lang/rust#121419, probably after the rename from `xros` to `visionos`. See the commits for details.

CC `@agg23`

Since you reviewed rust-lang/rust#121419
r? davidtwco

Author: GuillaumeGomez