From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1643) id 292103AA9812; Wed, 8 Jun 2022 12:02:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 292103AA9812 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 #900 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: 631f7ae7b9dbb55ed3adce942952f93b48983a53 X-Git-Newrev: 6e5f8f76cbe47880ceae1bcf0bf7f07f601517ec Message-Id: <20220608120245.292103AA9812@sourceware.org> Date: Wed, 8 Jun 2022 12:02:45 +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:02:45 -0000 https://gcc.gnu.org/g:6e5f8f76cbe47880ceae1bcf0bf7f07f601517ec commit 6e5f8f76cbe47880ceae1bcf0bf7f07f601517ec Merge: 631f7ae7b9d 4c36c7c8d31 Author: bors[bot] <26634292+bors[bot]@users.noreply.github.com> Date: Mon Jan 31 15:26:53 2022 +0000 Merge #900 900: Fixup logic in canonical-path for impl-blocks r=philberty a=philberty Impl blocks canonical prefix when the size is one will only contain the respective crate name but impl blocks canonical path will be of the Self type which has its own respective crate and path so this will become the canonical path of this. If the segment size greater than one this means it is likely inside a mod block or other item so this means we should just append as usual. Co-authored-by: Philip Herron Diff: gcc/rust/resolve/rust-ast-resolve-item.h | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)