[clang] Code owners -> Maintainers transition

[AaronBallman]

This is the initial transition from using "code owners" to using "maintainers".

[llvmbot]

@llvm/pr-subscribers-clang

Author: Aaron Ballman (AaronBallman)

Changes

This is the initial transition from using "code owners" to using "maintainers".

---

Full diff: https://github.com/llvm/llvm-project/pull/108997.diff

5 Files Affected:

• (renamed) clang/Maintainers.rst (+16-16)
• (modified) clang/docs/CMakeLists.txt (+1-1)
• (removed) clang/docs/CodeOwners.rst (-1)
• (added) clang/docs/Maintainers.rst (+1)
• (modified) clang/docs/index.rst (+1-1)

diff --git a/clang/CodeOwners.rst b/clang/Maintainers.rst
similarity index 92%
rename from clang/CodeOwners.rst
rename to clang/Maintainers.rst
index 2ae04c129eb765..766161dbbfc614 100644
--- a/clang/CodeOwners.rst
+++ b/clang/Maintainers.rst
@@ -1,30 +1,30 @@
 =================
-Clang Code Owners
+Clang Maintainers
 =================
 
 This file is a list of the
-`code owners <https://llvm.org/docs/DeveloperPolicy.html#code-owners>`_ for
+`maintainers <https://llvm.org/docs/DeveloperPolicy.html#maintainers>`_ for
 Clang.
 
 .. contents::
    :depth: 2
    :local:
 
-Current Code Owners
-===================
-The following people are the active code owners for the project. Please reach
+Active Maintainers
+==================
+The following people are the active maintainers for the project. Please reach
 out to them for code reviews, questions about their area of expertise, or other
 assistance.
 
-All parts of Clang not covered by someone else
-----------------------------------------------
+Lead Maintainer
+---------------
 | Aaron Ballman
 | aaron\@aaronballman.com (email), aaron.ballman (Phabricator), AaronBallman (GitHub), AaronBallman (Discourse), aaronballman (Discord), AaronBallman (IRC)
 
 
 Contained Components
 --------------------
-These code owners are responsible for particular high-level components within
+These maintainers are responsible for particular high-level components within
 Clang that are typically contained to one area of the compiler.
 
 AST matchers
@@ -125,7 +125,7 @@ Driver parts not covered by someone else
 
 Tools
 -----
-These code owners are responsible for user-facing tools under the Clang
+These maintainers are responsible for user-facing tools under the Clang
 umbrella or components used to support such tools.
 
 Tooling library
@@ -255,19 +255,19 @@ SYCL conformance
 | alexey.bader\@intel.com (email), bader (Phabricator), bader (GitHub)
 
 
-Former Code Owners
-==================
-The following people have graciously spent time performing code ownership
+Inactive Maintainers
+====================
+The following people have graciously spent time performing maintainership
 responsibilities but are no longer active in that role. Thank you for all your
 help with the success of the project!
 
-Emeritus owners
----------------
+Emeritus Lead Maintainers
+-------------------------
 | Doug Gregor (dgregor\@apple.com)
 | Richard Smith (richard\@metafoo.co.uk)
 
 
-Former component owners
------------------------
+Inactive component maintainers
+------------------------------
 | Chandler Carruth (chandlerc\@gmail.com, chandlerc\@google.com) -- CMake, library layering
 | Devin Coughlin (dcoughlin\@apple.com) -- Clang static analyzer
diff --git a/clang/docs/CMakeLists.txt b/clang/docs/CMakeLists.txt
index 51e9db29f887f3..4fecc007f59954 100644
--- a/clang/docs/CMakeLists.txt
+++ b/clang/docs/CMakeLists.txt
@@ -117,7 +117,7 @@ if (LLVM_ENABLE_SPHINX)
       "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_BINARY_DIR}"
 
       COMMAND "${CMAKE_COMMAND}" -E copy_if_different
-      "${CMAKE_CURRENT_SOURCE_DIR}/../CodeOwners.rst"
+      "${CMAKE_CURRENT_SOURCE_DIR}/../Maintainers.rst"
       "${CMAKE_CURRENT_BINARY_DIR}"
     )
 
diff --git a/clang/docs/CodeOwners.rst b/clang/docs/CodeOwners.rst
deleted file mode 100644
index 48128fbc5d909b..00000000000000
--- a/clang/docs/CodeOwners.rst
+++ /dev/null
@@ -1 +0,0 @@
-.. include:: ../CodeOwners.rst
diff --git a/clang/docs/Maintainers.rst b/clang/docs/Maintainers.rst
new file mode 100644
index 00000000000000..7e69c1165d2f54
--- /dev/null
+++ b/clang/docs/Maintainers.rst
@@ -0,0 +1 @@
+.. include:: ../Maintainers.rst
diff --git a/clang/docs/index.rst b/clang/docs/index.rst
index 4a497f4d9bcc3c..f4fdc93290a0d9 100644
--- a/clang/docs/index.rst
+++ b/clang/docs/index.rst
@@ -104,7 +104,7 @@ Design Documents
 .. toctree::
    :maxdepth: 1
 
-   CodeOwners
+   Maintainers
    InternalsManual
    DriverInternals
    Multilib

[AaronBallman]

We've recently updated our documentation regarding what responsibilities maintainers are volunteering to take on: https://llvm.org/docs/DeveloperPolicy.html#maintainers

I'm presuming that folks who have been actively performing reviews or commenting on RFCs over the past few months are still willing to be a maintainer because they're already doing the work. However, if you are listed as a maintainer and would like to be moved to an Inactive Maintainer, please let me know and I'll make the changes on your behalf (or you can do it yourself once these changes land).

@r4nt (AST Matchers, Tooling) and @Bigcheese (Modules & serialization) are the only two Clang maintainers who seem like they've not had much activity recently, so I'd appreciate an explicit comment whether you'd like to continue maintaining those areas of the compiler. If I don't hear back from you by the time these changes are ready to land, I'll move you to the Inactive Maintainer list and you're absolutely welcome to "reactivate" whenever you have the bandwidth if you'd like.

[AaronBallman]

FWIW, I plan to land these changes tomorrow morning.

[AaronBallman]

FWIW, I plan to land these changes tomorrow morning.

I lied. :-D I just emailed both Manuel and Michael privately and I want them to have some time to consider and respond before landing the changes, but I did make anticipatory changes.

[AaronBallman]

I heard back from Michael while I was out for WG14 meetings and he still intends to actively maintain modules and serialization, so I'm moving him back off the inactive maintainers list.