gccrs: Rename header rust-hir-trait-ref.h to rust-hir-trait-reference.h

Signed-off-by: Philip Herron <herron.philip@googlemail.com>

gcc/rust/ChangeLog:

	* typecheck/rust-hir-trait-ref.h: Moved to...
	* typecheck/rust-hir-trait-reference.h: ...here.
	* typecheck/rust-hir-trait-resolve.cc: refactor
	* typecheck/rust-hir-trait-resolve.h (RUST_HIR_TRAIT_RESOLVE_H): likewise
	* typecheck/rust-hir-type-check.h: likewise
	* typecheck/rust-tyty.cc: likewise
This commit is contained in:
Philip Herron
2023-01-17 22:45:52 +00:00
committed by Arthur Cohen
parent 6c4fa22d38
commit 1019fd6337
5 changed files with 13 additions and 10 deletions

View File

@@ -22,6 +22,16 @@
namespace Rust {
namespace Resolver {
TraitItemReference
ResolveTraitItemToRef::Resolve (
HIR::TraitItem &item, TyTy::BaseType *self,
std::vector<TyTy::SubstitutionParamMapping> substitutions)
{
ResolveTraitItemToRef resolver (self, std::move (substitutions));
item.accept_vis (resolver);
return std::move (resolver.resolved);
}
void
ResolveTraitItemToRef::visit (HIR::TraitItemType &type)
{

View File

@@ -19,9 +19,7 @@
#ifndef RUST_HIR_TRAIT_RESOLVE_H
#define RUST_HIR_TRAIT_RESOLVE_H
#include "rust-hir-type-check-base.h"
#include "rust-hir-type-check-type.h"
#include "rust-hir-trait-ref.h"
namespace Rust {
namespace Resolver {
@@ -32,12 +30,7 @@ class ResolveTraitItemToRef : public TypeCheckBase,
public:
static TraitItemReference
Resolve (HIR::TraitItem &item, TyTy::BaseType *self,
std::vector<TyTy::SubstitutionParamMapping> substitutions)
{
ResolveTraitItemToRef resolver (self, std::move (substitutions));
item.accept_vis (resolver);
return std::move (resolver.resolved);
}
std::vector<TyTy::SubstitutionParamMapping> substitutions);
void visit (HIR::TraitItemType &type) override;

View File

@@ -22,7 +22,7 @@
#include "rust-hir-full-decls.h"
#include "rust-hir-map.h"
#include "rust-tyty.h"
#include "rust-hir-trait-ref.h"
#include "rust-hir-trait-reference.h"
#include "rust-autoderef.h"
namespace Rust {

View File

@@ -27,7 +27,7 @@
#include "rust-linemap.h"
#include "rust-substitution-mapper.h"
#include "rust-hir-trait-ref.h"
#include "rust-hir-trait-reference.h"
#include "rust-hir-type-bounds.h"
#include "rust-hir-trait-resolve.h"
#include "rust-tyty-rules.h"