[gcc/devel/rust/master] Merge #1594 #1595

[gcc/devel/rust/master] Merge #1594 #1595

[Thomas Schwinge]

https://gcc.gnu.org/g:a14da50ebe674b8444c578454cd7914327f90755

commit a14da50ebe674b8444c578454cd7914327f90755
Merge: 3922772f5f2 e8c82076bc6 68af6007a9f
Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Date:   Mon Oct 17 09:33:26 2022 +0000

    Merge #1594 #1595
    
    1594: Refactor TraitResolver to not require a visitor r=philberty a=philberty
    
    We used a visitor to dispatch the HIR::Item so that we could cast it directly to an HIR::Trait and then check for nullptr if it failed. This patch changes this to simply use our new enum item_type_kind to switch so we can directly static_cast.
    
    
    1595: Support outer attribute handling on trait items just like normal items r=philberty a=philberty
    
    This patch adds a proxy class ItemWrapper to be a proxy allowing us to use the same code paths for attribute handling as we have with normal items. We need this so we can grab the fn trait associated type lang item's. Which are being missed currently.
    
    Addresses #195
    
    
    
    Co-authored-by: Philip Herron <philip.herron@embecosm.com>

Diff:

 gcc/rust/hir/rust-ast-lower-base.cc          |  6 ++--
 gcc/rust/hir/rust-ast-lower-base.h           | 30 ++++++++++++++--
 gcc/rust/hir/rust-ast-lower-implitem.h       | 14 ++++----
 gcc/rust/hir/tree/rust-hir-item.h            |  6 ++++
 gcc/rust/hir/tree/rust-hir.h                 |  4 ++-
 gcc/rust/typecheck/rust-hir-trait-resolve.cc | 53 ++++++++++++----------------
 gcc/rust/typecheck/rust-hir-trait-resolve.h  | 10 ++----
 gcc/rust/util/rust-hir-map.cc                | 24 +++++++++++++
 gcc/rust/util/rust-hir-map.h                 |  3 ++
 9 files changed, 98 insertions(+), 52 deletions(-)