Merge pull request #20179 from hvitved/rust/type-inference-certain-follow-up

Rust: Generalize certain type inference logic

Author: hvitved