Fix build with rustc 1.47

Import fixes for debian bug#975857 from Debian version 0.43.1-4, which in turn applied two upstream patches.

See https://salsa.debian.org/rust-team/cargo/-/commit/1d2d6ba9e7c6250c7c9fd3f72be6bcf16e13cdd9