Skip to content

Commit 43369f2

Browse files
powerboat9CohenArthur
authored andcommitted
nr2.0: Resolve type aliases inside trait definitions
gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Add visitor for TraitItemType. * resolve/rust-toplevel-name-resolver-2.0.h (TopLevel::visit): Likewise. gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: Remove entries. Signed-off-by: Owen Avery <[email protected]>
1 parent 9de4235 commit 43369f2

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,15 @@ TopLevel::visit (AST::Trait &trait)
109109
DefaultResolver::visit (trait);
110110
}
111111

112+
void
113+
TopLevel::visit (AST::TraitItemType &trait_item)
114+
{
115+
insert_or_error_out (trait_item.get_identifier ().as_string (), trait_item,
116+
Namespace::Types);
117+
118+
DefaultResolver::visit (trait_item);
119+
}
120+
112121
template <typename PROC_MACRO>
113122
static void
114123
insert_macros (std::vector<PROC_MACRO> &macros, NameResolutionContext &ctx)

gcc/rust/resolve/rust-toplevel-name-resolver-2.0.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@ class TopLevel : public DefaultResolver
148148

149149
void visit (AST::Module &module) override;
150150
void visit (AST::Trait &trait) override;
151+
void visit (AST::TraitItemType &trait_item) override;
151152
void visit (AST::MacroRulesDefinition &macro) override;
152153
void visit (AST::Function &function) override;
153154
void visit (AST::BlockExpr &expr) override;

gcc/testsuite/rust/compile/nr2/exclude

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ issue-2139.rs
7474
issue-2142.rs
7575
issue-2165.rs
7676
issue-2166.rs
77-
issue-2190-1.rs
78-
issue-2190-2.rs
7977
issue-2238.rs
8078
issue-2304.rs
8179
issue-2330.rs
@@ -85,7 +83,6 @@ issue-2723-1.rs
8583
issue-2723-2.rs
8684
issue-2772-2.rs
8785
issue-2775.rs
88-
issue-2747.rs
8986
issue-2782.rs
9087
issue-2812.rs
9188
issue-850.rs
@@ -98,7 +95,6 @@ macros/mbe/macro-issue1233.rs
9895
macros/mbe/macro-issue1400.rs
9996
macros/mbe/macro13.rs
10097
macros/mbe/macro15.rs
101-
macros/mbe/macro20.rs
10298
macros/mbe/macro23.rs
10399
macros/mbe/macro40.rs
104100
macros/mbe/macro43.rs
@@ -198,7 +194,6 @@ iflet.rs
198194
issue-3033.rs
199195
issue-3009.rs
200196
issue-2323.rs
201-
issue-2953-1.rs
202197
issue-2953-2.rs
203198
issue-1773.rs
204199
issue-2905-1.rs

0 commit comments

Comments
 (0)