From 7f2a7c09ef75b46c09a8423d578b5c1a2fa221ce Mon Sep 17 00:00:00 2001
From: Jacob Bramley <jacob.bramley@arm.com>
Date: Fri, 19 May 2023 16:49:41 +0100
Subject: [PATCH] Fix intrinsic-test author handling.

CARGO_PKG_AUTHORS is :-separated.

Also add myself to intrinsic-test authors.
---
 library/stdarch/crates/intrinsic-test/Cargo.toml  | 3 ++-
 library/stdarch/crates/intrinsic-test/src/main.rs | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/library/stdarch/crates/intrinsic-test/Cargo.toml b/library/stdarch/crates/intrinsic-test/Cargo.toml
index c7a18f77f5af..06af3c6b66d4 100644
--- a/library/stdarch/crates/intrinsic-test/Cargo.toml
+++ b/library/stdarch/crates/intrinsic-test/Cargo.toml
@@ -3,7 +3,8 @@ name = "intrinsic-test"
 version = "0.1.0"
 authors = ["Jamie Cunliffe <Jamie.Cunliffe@arm.com>",
     "James McGregor <James.McGregor2@arm.com",
-    "Adam Gemmell <Adam.Gemmell@arm.com"]
+    "Adam Gemmell <Adam.Gemmell@arm.com",
+    "Jacob Bramley <jacob.bramley@arm.com>"]
 license = "MIT OR Apache-2.0"
 edition = "2021"
 
diff --git a/library/stdarch/crates/intrinsic-test/src/main.rs b/library/stdarch/crates/intrinsic-test/src/main.rs
index 42e6c3053a43..297f76951a8e 100644
--- a/library/stdarch/crates/intrinsic-test/src/main.rs
+++ b/library/stdarch/crates/intrinsic-test/src/main.rs
@@ -266,7 +266,7 @@ fn build_rust(notices: &str, intrinsics: &[Intrinsic], toolchain: &str, a32: boo
                 r#"[package]
 name = "intrinsic-test-programs"
 version = "{version}"
-authors = ["{authors}"]
+authors = [{authors}]
 license = "{license}"
 edition = "2018"
 [workspace]
@@ -274,7 +274,9 @@ edition = "2018"
 core_arch = {{ path = "../crates/core_arch" }}
 {binaries}"#,
                 version = env!("CARGO_PKG_VERSION"),
-                authors = env!("CARGO_PKG_AUTHORS"),
+                authors = env!("CARGO_PKG_AUTHORS")
+                    .split(":")
+                    .format_with(", ", |author, fmt| fmt(&format_args!("\"{author}\""))),
                 license = env!("CARGO_PKG_LICENSE"),
                 binaries = intrinsics
                     .iter()