From patchwork Tue Jan 30 12:06:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1892821 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=eHpMOlg5; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPPQG6Bxgz23dQ for ; Tue, 30 Jan 2024 23:20:38 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 373763857434 for ; Tue, 30 Jan 2024 12:20:34 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 230223858037 for ; Tue, 30 Jan 2024 12:11:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 230223858037 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 230223858037 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616666; cv=none; b=q/f0k3seZI7V/M3T43SAxhYLbP+umC+GwbYfy47wO1Q2cy6DCMfLWiCOKOxx418kn5k1DkgLk1KF+qYPc11OWiivIr6p2rGRdIgPJKzQQi2l3jHwapmpy87GWJp9WvFNAPVhpErcSpyD/+K/1i9PBWb86IS/LmzgqvBKbWHCl44= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616666; c=relaxed/simple; bh=B6ARVYXELAe6CqsolDgpi4/wV5Zs4MNx7wtvjNSM228=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Q9xkfS3pHNyeNeXM21yHvnGkgjBspQ3bWYIS/rFPqnDYgCdSHR6mVMqLEqnWvCAE99DhI92HInZIg4nqoy4hZNhFBmSGo8usordXrpxbj8HyEfCkArsbYLPW6rPxG3XujHjHdigKhFSO8radI+LKvzZwdXAhp/+fHcsbTdEIEso= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40efcb37373so8959155e9.2 for ; Tue, 30 Jan 2024 04:11:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616660; x=1707221460; darn=gcc.gnu.org; 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=AyRNf4lSAfxyQsH5fPehileaxW/ucbVOZ214gA+esq0=; b=eHpMOlg571fwo8pzkUnhAOGQbPY2hTc/EU9RYf+vNfA13gz4MTH0GI+xZAFCdUwlUu +Aq1IuTgt64jxl+5z8YKF5vBccxSOiz5Na4mxCJ5XJtx/dgdFmHGre0DIywFXYRxDU62 Zfk6CokIHSFPwpNpHpcvOD8A7657dOBJLvRB0Mhn2JIh4qvGLHvUhqQLmzwRW2Yv9Sqm osWFXoEC373Ze8k6DORskGGve7sJ76UVioDBvGf8YY1jyAI+Xd9BnqwtpCFyf4wJA//D NgjThtuKGm4A0aB8DUG/i8FKdxDCKTyRohAg6IxE5zNnOTsES4CNpBULQn983eYg+spj W4Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616660; x=1707221460; 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=AyRNf4lSAfxyQsH5fPehileaxW/ucbVOZ214gA+esq0=; b=i4xEkAGC7EnFzQx7usITvQNY3zy0iLSWMV6Nf2KoBmdxHZCvu5fLR2mh8MriVOVAwQ SXzM00wOGsP23R6PaVb4+3sQFC7AjxJHt1azmAcmqcFgTaAgUYhTpJV7NFxhpNW2IfUq y15kXW9z4RyPNGNQaFCTYF/ulBD6T3i3dbX9ZO7g7BpiD0CKAgt1erjudlUbb/eYWm2x a8ZdMlaLezJi/fryB18eobYdksZEedMNAP/+DbEZg7nNX0hTWloUow/t3KqHhVWkucpO R/n7Tvc4ErLz/+CUKLI4lzoUUD2rh5G3J6dgQugkmRFuPQahq6G4nT6828GIa5b2ubtg dxxA== X-Gm-Message-State: AOJu0Yy0QW/iQjA0UBDQ12VEdnlTaOIakhqtqSFsQKqW8VMra2tF+YhB IPeQvVgsPTd3MYJXNhsCakvtRN8mvpMKaoiVoPaN5c5F7mzvct0u0ItGqxErz7L8UQ6ZVjBfzFB j8Q== X-Google-Smtp-Source: AGHT+IHgjY4kwudvcHMzp0oIXqRsuDDAwYQpdU4k8t44G8AtvAJUFhXO6PsH0BNWrLYbsom18kyJYA== X-Received: by 2002:adf:ae4a:0:b0:337:bf75:7703 with SMTP id u10-20020adfae4a000000b00337bf757703mr5808724wrd.58.1706616660693; Tue, 30 Jan 2024 04:11:00 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.10.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:00 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Arthur Cohen Subject: [COMMITTED 014/101] gccrs: resolve: Format if properly Date: Tue, 30 Jan 2024 13:06:30 +0100 Message-ID: <20240130121026.807464-17-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.1 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, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Arthur Cohen gcc/rust/ChangeLog: * resolve/rust-ast-resolve-path.cc (ResolvePath::resolve_path): Format. --- gcc/rust/resolve/rust-ast-resolve-path.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gcc/rust/resolve/rust-ast-resolve-path.cc b/gcc/rust/resolve/rust-ast-resolve-path.cc index 9e982d0610e..56c352e13ea 100644 --- a/gcc/rust/resolve/rust-ast-resolve-path.cc +++ b/gcc/rust/resolve/rust-ast-resolve-path.cc @@ -368,9 +368,7 @@ ResolvePath::resolve_path (AST::SimplePath *expr) // is_final_segment ? "true" : "false"); if (resolved_node_id == UNKNOWN_NODEID && !is_first_segment && is_final_segment && segment.is_lower_self_seg ()) - { - resolved_node_id = previous_resolved_node_id; - } + resolved_node_id = previous_resolved_node_id; // final check if (resolved_node_id == UNKNOWN_NODEID)