From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id D1E81386CE63; Wed, 8 Jun 2022 12:42:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org D1E81386CE63 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Thomas Schwinge To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/rust/master] Merge #1191 X-Act-Checkin: gcc X-Git-Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> X-Git-Refname: refs/heads/devel/rust/master X-Git-Oldrev: 27e562a2c07c9f09c80f905cf7ebc4a5b25672eb X-Git-Newrev: fb136314f9584744ccc7b09ace3cea99129b7cf4 Message-Id: <20220608124201.D1E81386CE63@sourceware.org> Date: Wed, 8 Jun 2022 12:42:01 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jun 2022 12:42:01 -0000 https://gcc.gnu.org/g:fb136314f9584744ccc7b09ace3cea99129b7cf4 commit fb136314f9584744ccc7b09ace3cea99129b7cf4 Merge: 27e562a2c07 98e1de2d8fd Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon May 2 14:32:12 2022 +0000 Merge #1191 1191: Resolve simple paths in use items r=CohenArthur a=CohenArthur In order to resolve `SimplePath`s, we have to expand all paths present in a `UseDeclaration` and resolve them. For example, we want to resolve two paths with the following statement `use foo::bar::{baz, bul}`: `foo::bar::baz` and `foo::bar::bul` This also removes the prelude inclusion (`use std::prelude::v1::*`) since we cannot resolve it (yet!) Needs #1172 to compile Adresses #1159 Adresses #1187 Co-authored-by: Arthur Cohen Diff: gcc/rust/ast/rust-ast.h | 2 + gcc/rust/ast/rust-item.h | 57 +++++ gcc/rust/resolve/rust-ast-resolve-item.cc | 297 ++++++++++++++++++++++++- gcc/rust/resolve/rust-ast-resolve-item.h | 11 + gcc/rust/resolve/rust-ast-resolve-type.cc | 47 ++++ gcc/rust/resolve/rust-ast-resolve-type.h | 55 +---- gcc/rust/rust-lang.cc | 2 + gcc/rust/rust-session-manager.cc | 36 +-- gcc/testsuite/rust/compile/torture/cfg_attr.rs | 2 +- gcc/testsuite/rust/compile/use_1.rs | 16 ++ 10 files changed, 455 insertions(+), 70 deletions(-)