From patchwork Thu Aug 1 14:56:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1967743 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=NSslZNSp; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4WZXV00Z07z1ybV for ; Fri, 2 Aug 2024 01:11:04 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C664B3861034 for ; Thu, 1 Aug 2024 15:11:01 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by sourceware.org (Postfix) with ESMTPS id DD947385E837 for ; Thu, 1 Aug 2024 14:58:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DD947385E837 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 DD947385E837 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::52b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524340; cv=none; b=itpM5tlQFGP6zKn/RO6WKAbm04J6jNkOEaAovd1zYYyXO0L0BvPxXOww8s8iylNXPY3UIhKf1VFpQscQZJY0Kof96aeRAbRZ/HjAYjr7ooo7bgWQutcyc/edDWX6+icWJ1ZKwgcV/3Ud/P8ZYJMbLyihvLCNQPm3W061Uj2ZjVk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722524340; c=relaxed/simple; bh=fmxdXf5bHoP5MjjZTDBEt/TXNCzK0etJEwtzfHexsdE=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=ZQ9htMfR+SU0E9Lu8TCWhBjkp408I/DrL2/7gSE7g/prf7tkRV+OSl5GdQ6sD2n+l1I0rhru0Ro8FaXmisibseXnMU7+tBOTaYtzr/bndWYqRgjAA9NNgTjAbQVyML6PzW0BwSIDtQJm3+QcmMOFLXMDc04xRJDHG/aWGmhpk+4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-5a1f9bc80e3so5837329a12.2 for ; Thu, 01 Aug 2024 07:58:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1722524327; x=1723129127; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Q+4icTR5t6V+EBwoPn6ICeWua3lLE3aZEjlaYRrbN7U=; b=NSslZNSpgOZj/1qcMO7eercqigvV52PMnYdUrNmLrzRyubGpQLo1xP0BiwFfK5gQDx ofuIo35X7p+By3VkpkEE5Vvhh9Ye44RKtsMK5BbgD1Y2nS55CXVH2uV/2djv1WcCb6jV QEOMWsVbG0D2iQPVWpDTy7dfaH5hWZ6yY5GIbEQcL4JadQuaJ8VrxXqC1O5Mu9ZJeMBi fuowu+axsyjMNlhcRYoGB1I6uEJ9WV8ckcDIojQrutg24X/Rd/NPwW3vHQrdYVjJ1Agx kAEKkdKyMHTh2irZe55McpzFpBOM4v4yqf0R6DP1CxDiHS6y2YzOJgbX96TlCALz8HNh ThNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722524327; x=1723129127; h=content-transfer-encoding:mime-version: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=Q+4icTR5t6V+EBwoPn6ICeWua3lLE3aZEjlaYRrbN7U=; b=WaeWd1U37FCoyAXX6Hxh6Ofim1wbgQQt/XmroMAu/vrLHfHO8B9W0yTWCYtSD4l9tt Jao8gp4UebXdU9iyqLfZY+V3S7ZL41ee+UxJfK7cXDSgiZrY1v/JdnFM0vGjNijjIv0b R8x95o6RZHKUd8vrOHsUq68QZJRqYFuryOM47vtgUPDiWGrUX3f5qmSL7ujha7YJo3Iq z7Ss/Uj1n0V53yQNq706vvRFUJmvd0e6IU6XO3ltxp1HtvF0bzs9PC8a7PRjVYosGEUp utTzeqFDPf3BFpQIozAgX1XQjezUtSmVsFNgDuf9nYW8X0aDf49dClf4h6iIrT+sqzAi hcGQ== X-Gm-Message-State: AOJu0Yw/5draMVTZSwBCSUi3IVw3ORhcYSQA354BsrBxoQMCnW+MiPs6 CKYMfRopoOcLD1Q4rwPge4Z80saywwlQLYTeH3cOQv0iVamccDDVLhyH6VJ3inUZ/yQpA790ykz /ibJe X-Google-Smtp-Source: AGHT+IEpDYxnnvW1RpNxAv8zIhKVvp1NdK/N2OjLdEeEw84i1PuqCdeWAKuMu5f9ymeHpZIFVYRGow== X-Received: by 2002:aa7:cc01:0:b0:5a1:de88:a5ef with SMTP id 4fb4d7f45d1cf-5b7f521e584mr515547a12.27.1722524327146; Thu, 01 Aug 2024 07:58:47 -0700 (PDT) Received: from platypus.lan ([2a04:cec2:9:dc84:3622:6733:ff49:ee91]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ac63590592sm10252456a12.25.2024.08.01.07.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Aug 2024 07:58:46 -0700 (PDT) From: Arthur Cohen To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Owen Avery Subject: [PATCH 020/125] gccrs: Adjust error checks to match name resolution 2.0 Date: Thu, 1 Aug 2024 16:56:16 +0200 Message-ID: <20240801145809.366388-22-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240801145809.366388-2-arthur.cohen@embecosm.com> References: <20240801145809.366388-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham 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: , Errors-To: gcc-patches-bounces~incoming=patchwork.ozlabs.org@gcc.gnu.org From: Owen Avery gcc/testsuite/ChangeLog: * rust/compile/bad_stmt_enums.rs: Adjust redefinition error. * rust/compile/bad_toplevel_enums.rs: Likewise. * rust/compile/redef_error1.rs: Likewise. * rust/compile/redef_error3.rs: Likewise. * rust/compile/redef_error4.rs: Likewise. * rust/compile/redef_error6.rs: Likewise. Signed-off-by: Owen Avery --- gcc/testsuite/rust/compile/bad_stmt_enums.rs | 6 +++--- gcc/testsuite/rust/compile/bad_toplevel_enums.rs | 6 +++--- gcc/testsuite/rust/compile/redef_error1.rs | 2 +- gcc/testsuite/rust/compile/redef_error3.rs | 2 +- gcc/testsuite/rust/compile/redef_error4.rs | 2 +- gcc/testsuite/rust/compile/redef_error6.rs | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gcc/testsuite/rust/compile/bad_stmt_enums.rs b/gcc/testsuite/rust/compile/bad_stmt_enums.rs index 7b09a94fd27..b83137f96b8 100644 --- a/gcc/testsuite/rust/compile/bad_stmt_enums.rs +++ b/gcc/testsuite/rust/compile/bad_stmt_enums.rs @@ -5,17 +5,17 @@ fn main () Alpha { alpha: i32 }, pub Beta (u8), pub Gamma, - Gamma { gamma: u32 } // { dg-error "redefined" } + Gamma { gamma: u32 } // { dg-error "defined multiple times" } } struct EE2 { } - enum EE2 { } // { dg-error "redefined" } + enum EE2 { } // { dg-error "defined multiple times" } enum EE1 { pub Alpha, Beta = 41, - Beta = 42, // { dg-error "redefined" } + Beta = 42, // { dg-error "defined multiple times" } pub Gamma = 3, D, } diff --git a/gcc/testsuite/rust/compile/bad_toplevel_enums.rs b/gcc/testsuite/rust/compile/bad_toplevel_enums.rs index b655e30a93d..137095bf00c 100644 --- a/gcc/testsuite/rust/compile/bad_toplevel_enums.rs +++ b/gcc/testsuite/rust/compile/bad_toplevel_enums.rs @@ -3,17 +3,17 @@ pub enum E pub A { a: i32 }, B (u8), pub C, - B // { dg-error "redefined" } + B // { dg-error "defined multiple times" } } enum E2 { } -struct E2 { } // { dg-error "redefined" } +struct E2 { } // { dg-error "defined multiple times" } enum E1 { A, pub B = 42, C = 3, - A { a: u8 }, // { dg-error "redefined" } + A { a: u8 }, // { dg-error "defined multiple times" } pub D } diff --git a/gcc/testsuite/rust/compile/redef_error1.rs b/gcc/testsuite/rust/compile/redef_error1.rs index ae51e36c87f..5a85f1e50fe 100644 --- a/gcc/testsuite/rust/compile/redef_error1.rs +++ b/gcc/testsuite/rust/compile/redef_error1.rs @@ -3,6 +3,6 @@ struct S1 { y: f64, } -struct S1(i32, bool); // { dg-error "redefined multiple times" } +struct S1(i32, bool); // { dg-error "defined multiple times" } fn main() {} diff --git a/gcc/testsuite/rust/compile/redef_error3.rs b/gcc/testsuite/rust/compile/redef_error3.rs index a4bf1ed3d8c..cc1cceba8bb 100644 --- a/gcc/testsuite/rust/compile/redef_error3.rs +++ b/gcc/testsuite/rust/compile/redef_error3.rs @@ -2,7 +2,7 @@ fn test() -> bool { true } -fn test() -> i32 { // { dg-error "redefined multiple times" } +fn test() -> i32 { // { dg-error "defined multiple times" } 123 } diff --git a/gcc/testsuite/rust/compile/redef_error4.rs b/gcc/testsuite/rust/compile/redef_error4.rs index a250c0ac00e..3faebb75abe 100644 --- a/gcc/testsuite/rust/compile/redef_error4.rs +++ b/gcc/testsuite/rust/compile/redef_error4.rs @@ -9,7 +9,7 @@ impl Foo { test() } - fn test() -> bool { // { dg-error "redefined multiple times" } + fn test() -> bool { // { dg-error "defined multiple times" } true } } diff --git a/gcc/testsuite/rust/compile/redef_error6.rs b/gcc/testsuite/rust/compile/redef_error6.rs index 664c6ae9894..f7f688b5f36 100644 --- a/gcc/testsuite/rust/compile/redef_error6.rs +++ b/gcc/testsuite/rust/compile/redef_error6.rs @@ -5,7 +5,7 @@ impl Foo { 123 } - fn test(self) -> i32 { // { dg-error "redefined multiple times" } + fn test(self) -> i32 { // { dg-error "defined multiple times" } self.0 } }