From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 5E497383EC61; Thu, 30 Jun 2022 18:51:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5E497383EC61 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 #1336 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: 81abc8623cb75fa18315c65e94c5965ec36fdb54 X-Git-Newrev: 33912c1a08d3892d3c72506aed38771754b9cf54 Message-Id: <20220630185113.5E497383EC61@sourceware.org> Date: Thu, 30 Jun 2022 18:51:13 +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: Thu, 30 Jun 2022 18:51:13 -0000 https://gcc.gnu.org/g:33912c1a08d3892d3c72506aed38771754b9cf54 commit 33912c1a08d3892d3c72506aed38771754b9cf54 Merge: 81abc8623cb 93f63a94d43 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Thu Jun 30 15:52:01 2022 +0000 Merge #1336 1336: Resolve const generic parameters r=CohenArthur a=CohenArthur Fixes #1319. This can only resolve the simpler test cases: Anything that is ambiguous is ignored and does not get resolved. This will be fixed very soon :) Co-authored-by: Arthur Cohen Diff: gcc/rust/ast/rust-ast-full-test.cc | 4 +- gcc/rust/ast/rust-ast.h | 69 ------------------- gcc/rust/ast/rust-path.h | 77 ++++++++++++++++++++- gcc/rust/hir/rust-ast-lower-type.h | 12 ++-- gcc/rust/parse/rust-parse-impl.h | 2 +- gcc/rust/resolve/rust-ast-resolve-item.cc | 95 ++++++++------------------ gcc/rust/resolve/rust-ast-resolve-item.h | 11 ++- gcc/rust/resolve/rust-ast-resolve-stmt.cc | 2 +- gcc/rust/resolve/rust-ast-resolve-stmt.h | 26 ++----- gcc/rust/resolve/rust-ast-resolve-type.h | 27 ++++++-- gcc/testsuite/rust/compile/const_generics_4.rs | 7 ++ 11 files changed, 161 insertions(+), 171 deletions(-)