From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by sourceware.org (Postfix) with ESMTPS id 7D4D738560B7 for ; Wed, 5 Apr 2023 14:06:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7D4D738560B7 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com Received: by mail-wm1-x32d.google.com with SMTP id j1-20020a05600c1c0100b003f04da00d07so2155192wms.1 for ; Wed, 05 Apr 2023 07:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1680703560; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=8/xIvDtYrUqtcbhn4l7mUfHym4tc/4Xfd9TM/B/rF+0=; b=L1iLi14uLmMvXpxCPfwFGpEhrZTNOkiK9mMPZvaMnhopZSPoV736x7rJ/JG2kr6dTI ilAqREK9NV0F2oVhh2Tvl7BBQkLBaErgm5EopuIt1Tia2B+4qN3wmppzvjJtamvnl7NU 7C5XCrXXVebmIAHg5s60yBprkrQPuPx3i6bQwW+NNFa7I9IYkWvvD6HRJg3bSo7bKNgy m7fOnnSawQ+bLeaseXaew6Kugqvm3KIQpKiogjPlkde5OB3wPiJ+Ori0EaREvp0oLN3i dvW17gxiHC6RD6omqURcnDM785QMw/W8IDKhUInyiXBeoHMeGnTjt9Ip9zpXZMeY6Oy9 d2kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680703560; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=8/xIvDtYrUqtcbhn4l7mUfHym4tc/4Xfd9TM/B/rF+0=; b=OfkqSyfUDUzqUgOk2j/IlFFS2bl8/H+LohWRRA1ZtqP2Bqty2kCYsEQ1yKUdgaro7w iAAQfnL7uhEKTz9LLfSCjKyYtU2krJUNDb/VK0giXLZvVby27822RRNw8JkcJYLwDIBx sdD+9rHLNbLiaMJWo3AHut69WuTKRzzT3R6iBK3W+24zZu18idz08ULhVYyI8gs5WA6E demNKupwMtosZ67JvPDOUYOd/t538/qA2w6wKG6bv9yzdlbQA5jhl4SqKwldcBhBAp2B 9grFfOEr1cqSxftxA3DZhAJm1khfFeZwP5Z/HusAGFryTB4FpPAVWeDTvsKyuCzTeEBW WFrQ== X-Gm-Message-State: AAQBX9fQfTK3DlxE9fez91nj2FAq4kuYXW4s8sfW3U48Z+cEmWDJ6+nl zFLOVtBZp19tGzpPhVKK8vG1 X-Google-Smtp-Source: AKy350ZI61Vw6aXYD0Ll1TeUf+OQuMk2PbE/Sa9WiSgt0JWGv6wbuHrbuxqtYrHwYTHelBMK9kQwwg== X-Received: by 2002:a1c:6a04:0:b0:3ee:da1:1346 with SMTP id f4-20020a1c6a04000000b003ee0da11346mr4789907wmc.36.1680703560238; Wed, 05 Apr 2023 07:06:00 -0700 (PDT) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id ay8-20020a05600c1e0800b003edddae1068sm2330150wmb.9.2023.04.05.07.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 Apr 2023 07:06:00 -0700 (PDT) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Philip Herron Subject: [committed 45/88] gccrs: Rename header rust-hir-trait-ref.h to rust-hir-trait-reference.h Date: Wed, 5 Apr 2023 16:03:29 +0200 Message-Id: <20230405140411.3016563-46-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230405140411.3016563-1-arthur.cohen@embecosm.com> References: <20230405140411.3016563-1-arthur.cohen@embecosm.com> Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Philip Herron Signed-off-by: Philip Herron 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 --- ...rust-hir-trait-ref.h => rust-hir-trait-reference.h} | 0 gcc/rust/typecheck/rust-hir-trait-resolve.cc | 10 ++++++++++ gcc/rust/typecheck/rust-hir-trait-resolve.h | 9 +-------- gcc/rust/typecheck/rust-hir-type-check.h | 2 +- gcc/rust/typecheck/rust-tyty.cc | 2 +- 5 files changed, 13 insertions(+), 10 deletions(-) rename gcc/rust/typecheck/{rust-hir-trait-ref.h => rust-hir-trait-reference.h} (100%) diff --git a/gcc/rust/typecheck/rust-hir-trait-ref.h b/gcc/rust/typecheck/rust-hir-trait-reference.h similarity index 100% rename from gcc/rust/typecheck/rust-hir-trait-ref.h rename to gcc/rust/typecheck/rust-hir-trait-reference.h diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc index 19f95ca4488..e2d0cf2d7a2 100644 --- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc +++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc @@ -22,6 +22,16 @@ namespace Rust { namespace Resolver { +TraitItemReference +ResolveTraitItemToRef::Resolve ( + HIR::TraitItem &item, TyTy::BaseType *self, + std::vector substitutions) +{ + ResolveTraitItemToRef resolver (self, std::move (substitutions)); + item.accept_vis (resolver); + return std::move (resolver.resolved); +} + void ResolveTraitItemToRef::visit (HIR::TraitItemType &type) { diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.h b/gcc/rust/typecheck/rust-hir-trait-resolve.h index ca23d48c3dd..da8e2c0b838 100644 --- a/gcc/rust/typecheck/rust-hir-trait-resolve.h +++ b/gcc/rust/typecheck/rust-hir-trait-resolve.h @@ -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 substitutions) - { - ResolveTraitItemToRef resolver (self, std::move (substitutions)); - item.accept_vis (resolver); - return std::move (resolver.resolved); - } + std::vector substitutions); void visit (HIR::TraitItemType &type) override; diff --git a/gcc/rust/typecheck/rust-hir-type-check.h b/gcc/rust/typecheck/rust-hir-type-check.h index d1eb750a621..512453947a6 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.h +++ b/gcc/rust/typecheck/rust-hir-type-check.h @@ -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 { diff --git a/gcc/rust/typecheck/rust-tyty.cc b/gcc/rust/typecheck/rust-tyty.cc index 61c02a85c53..4c324c66c16 100644 --- a/gcc/rust/typecheck/rust-tyty.cc +++ b/gcc/rust/typecheck/rust-tyty.cc @@ -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" -- 2.40.0