From: Muhammad Mahad <mahadtxt@gmail.com>
Date: Sat, 5 Aug 2023 07:55:36 +0000 (+0500)
Subject: gccrs: [E0308] array misamatch types
X-Git-Tag: basepoints/gcc-15~2236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c24d0e9033df80b564e7e72803195ad10c1e4221;p=thirdparty%2Fgcc.git

gccrs: [E0308] array misamatch types

gcc/rust/ChangeLog:

	* backend/rust-compile.cc (HIRCompileBase::verify_array_capacities):
	Added ErrorCode.

gcc/testsuite/ChangeLog:

	* rust/compile/arrays2.rs: changed comment to pass
	testcase.

Signed-off-by: Muhammad Mahad <mahadtxt@gmail.com>
---

diff --git a/gcc/rust/backend/rust-compile.cc b/gcc/rust/backend/rust-compile.cc
index 2c2a2361e590..93f740fb8128 100644
--- a/gcc/rust/backend/rust-compile.cc
+++ b/gcc/rust/backend/rust-compile.cc
@@ -401,11 +401,12 @@ HIRCompileBase::verify_array_capacities (tree ltype, tree rtype,
 
   if (ltype_length != rtype_length)
     {
-      rust_error_at (
-	rvalue_locus,
-	"expected an array with a fixed size of " HOST_WIDE_INT_PRINT_UNSIGNED
-	" elements, found one with " HOST_WIDE_INT_PRINT_UNSIGNED " elements",
-	ltype_length, rtype_length);
+      rust_error_at (rvalue_locus, ErrorCode::E0308,
+		     "mismatched types, expected an array with a fixed size "
+		     "of " HOST_WIDE_INT_PRINT_UNSIGNED
+		     " elements, found one with " HOST_WIDE_INT_PRINT_UNSIGNED
+		     " elements",
+		     ltype_length, rtype_length);
       return false;
     }
 
diff --git a/gcc/testsuite/rust/compile/arrays2.rs b/gcc/testsuite/rust/compile/arrays2.rs
index c96f4f7d8208..668bcf0951b1 100644
--- a/gcc/testsuite/rust/compile/arrays2.rs
+++ b/gcc/testsuite/rust/compile/arrays2.rs
@@ -1,5 +1,5 @@
 // { dg-additional-options "-w" }
 fn main() {
     let array: [i32; 5] = [1, 2, 3];
-    // { dg-error "expected an array with a fixed size of 5 elements, found one with 3 elements" "" { target *-*-* } .-1 }
+    // { dg-error "mismatched types, expected an array with a fixed size of 5 elements, found one with 3 elements" "" { target *-*-* } .-1 }
 }