From b90bcd6e7deb0c42c63b9f909788bdef8c737541 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Fri, 19 Apr 2024 05:51:02 +0200
Subject: [PATCH 1/3] Make autolabelling for macOS slightly better

---
 triagebot.toml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/triagebot.toml b/triagebot.toml
index 66b8f44d68898..79db356edff39 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -227,7 +227,9 @@ trigger_files = [
 
 [autolabel."O-macos"]
 trigger_files = [
-    "library/std/src/os/macos"
+    "library/std/src/os/macos",
+    "library/std/src/sys/pal/unix/thread_parking/darwin.rs",
+    "compiler/rustc_target/src/spec/base/apple",
 ]
 
 [autolabel."O-netbsd"]

From e64cbc4edb4e752225ba7fd640af9bfbdf7ff66e Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Fri, 19 Apr 2024 05:51:44 +0200
Subject: [PATCH 2/3] Rename `macos` ping group to `apple`

---
 triagebot.toml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/triagebot.toml b/triagebot.toml
index 79db356edff39..9bd012d7c03cb 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -106,10 +106,16 @@ resolved/implemented on Fuchsia. Could one of you weigh in?
 """
 label = "O-fuchsia"
 
-[ping.macos]
+[ping.apple]
+alias = ["macos", "ios", "tvos", "watchos", "visionos"]
 message = """\
-Hey MacOS Group! This issue or PR could use some MacOS-specific guidance. Could one
-of you weigh in? Thanks <3
+Hey Apple notification group! This issue or PR could use some Apple-specific
+guidance. Could one of you weigh in? Thanks <3
+
+(In case it's useful, here are some [instructions] for tackling these sorts of
+issues).
+
+[instructions]: https://rustc-dev-guide.rust-lang.org/notification-groups/apple.html
 """
 label = "O-macos"
 

From dc153f8c50087184061089ecea00931295fd403a Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Sun, 5 May 2024 20:56:03 +0200
Subject: [PATCH 3/3] Change the label for the Apple ping group to the new
 O-apple

---
 triagebot.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/triagebot.toml b/triagebot.toml
index 9bd012d7c03cb..0c96e159773c2 100644
--- a/triagebot.toml
+++ b/triagebot.toml
@@ -117,7 +117,7 @@ issues).
 
 [instructions]: https://rustc-dev-guide.rust-lang.org/notification-groups/apple.html
 """
-label = "O-macos"
+label = "O-apple"
 
 [prioritize]
 label = "I-prioritize"