[gcc/devel/rust/master] Merge #1184

[gcc/devel/rust/master] Merge #1184

[Thomas Schwinge]

https://gcc.gnu.org/g:9a9bb44058a8406b41bb1ab3110e08a897772bb0

commit 9a9bb44058a8406b41bb1ab3110e08a897772bb0
Merge: 60f7f998a21 ea38a59ee83
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Wed Apr 27 13:38:41 2022 +0000

    Merge #1184
    
    1184: Fix bad name resolution on path with generic segments r=philberty a=philberty
    
    This fix breaks down into two commits the first commit fixes the issue directly
    then the second one fixes the regression that was introduced in the first.
    
    The TLDR for this patch set is that when we resolve the path here:
    
      module::transmute
    
    The name-resolver wronly added the specified generic arguments into the canonical
    path meaning that the root segment could not be name-resolved such that during
    type resolution we iterate and apply the generic arguments appropriately to the root
    segment.
    
    In fixing this it introduced a regression exposing a few more complex issues with
    inference variables but for a more complete explanation about that please read the
    commit message from ea38a59ee8329bb7b309400a7de57d53ad7bde31
    
    Fixes #1173
    
    Co-authored-by: Philip Herron <philip.herron@embecosm.com>

Diff:

 gcc/rust/hir/tree/rust-hir-path.h              |   2 +
 gcc/rust/resolve/rust-ast-resolve-type.h       |   7 +-
 gcc/rust/typecheck/rust-hir-type-check-expr.h  |   8 --
 gcc/rust/typecheck/rust-hir-type-check-path.cc | 106 ++++++-------------------
 gcc/rust/typecheck/rust-hir-type-check.cc      |   9 +--
 gcc/rust/typecheck/rust-tyty-rules.h           |   5 ++
 gcc/rust/typecheck/rust-tyty.cc                |  31 +++++++-
 gcc/rust/typecheck/rust-tyty.h                 |  15 +++-
 gcc/testsuite/rust/compile/issue-1173.rs       |  20 +++++
 9 files changed, 96 insertions(+), 107 deletions(-)