Merge pull request #22517 from github/rust/path-resolution-toolchain

Rust: Make path resolution tests work with Rust 1.96 and fix `m::{self}` when `m` is a trait