diff --git a/.taplo.toml b/.taplo.toml
new file mode 100644
index 000000000..6de162ca7
--- /dev/null
+++ b/.taplo.toml
@@ -0,0 +1,15 @@
+[formatting]
+align_comments = false
+allowed_blank_lines = 1
+array_auto_collapse = false
+array_auto_expand = false
+indent_string = "    "
+
+# TODO: consider sorting arrays of team members if we can agree on how the sort
+# order should be case sensitive.
+#
+# [[rule]]
+# include = ["teams/**/*.toml"]
+# keys = ["people"]
+# [rule.formatting]
+# reorder_arrays = true
diff --git a/Cargo.toml b/Cargo.toml
index 6f73daa0f..9cb7cf0f6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,5 +31,5 @@ walkdir = "2.3.1"
 
 [workspace]
 members = [
-    "rust_team_data"
+    "rust_team_data",
 ]
diff --git a/people/Aatch.toml b/people/Aatch.toml
index 0da9df16d..c3e75052d 100644
--- a/people/Aatch.toml
+++ b/people/Aatch.toml
@@ -2,4 +2,3 @@ name = "James Miller"
 github = "Aatch"
 github-id = 342416
 email = "james@aatch.net"
-
diff --git a/people/AlexEne.toml b/people/AlexEne.toml
index fe3098a1c..fd4c4e540 100644
--- a/people/AlexEne.toml
+++ b/people/AlexEne.toml
@@ -1,4 +1,4 @@
 name = "Alexandru Ene"
 github = "AlexEne"
 github-id = 5849037
-email = "alexene0x11@gmail.com"
\ No newline at end of file
+email = "alexene0x11@gmail.com"
diff --git a/people/LawnGnome.toml b/people/LawnGnome.toml
index a48907b6e..ce36fd4f6 100644
--- a/people/LawnGnome.toml
+++ b/people/LawnGnome.toml
@@ -3,4 +3,4 @@ github = 'LawnGnome'
 github-id = 229984
 email = 'adam@adamharvey.name'
 zulip-id = 599587
-discord-id = 676243966408261632
\ No newline at end of file
+discord-id = 676243966408261632
diff --git a/people/Lokathor.toml b/people/Lokathor.toml
index 8c2761b94..f00692132 100644
--- a/people/Lokathor.toml
+++ b/people/Lokathor.toml
@@ -1,4 +1,4 @@
 name = "Daniel Gee"
 github = "Lokathor"
 github-id = 5456384
-email = "zefria@gmail.com"
\ No newline at end of file
+email = "zefria@gmail.com"
diff --git a/people/LucasBullen.toml b/people/LucasBullen.toml
index 37a6ef43a..18fa383cf 100644
--- a/people/LucasBullen.toml
+++ b/people/LucasBullen.toml
@@ -2,4 +2,3 @@ name = "Lucas Bullen"
 github = "LucasBullen"
 github-id = 10255066
 email = "lbullen@redhat.com"
-
diff --git a/people/PeytonT.toml b/people/PeytonT.toml
index 410d9a0ed..653f9aff4 100644
--- a/people/PeytonT.toml
+++ b/people/PeytonT.toml
@@ -1,4 +1,4 @@
 name = 'Peyton Turner'
 github = 'PeytonT'
 github-id = 22621596
-email = "donaldpeytonturner@gmail.com"
\ No newline at end of file
+email = "donaldpeytonturner@gmail.com"
diff --git a/people/Wodann.toml b/people/Wodann.toml
index dbad9a80d..9c8ded976 100644
--- a/people/Wodann.toml
+++ b/people/Wodann.toml
@@ -1,4 +1,4 @@
 name = "Remco"
 github = "Wodann"
 github-id = 6917585
-email= "wodannson@gmail.com"
\ No newline at end of file
+email = "wodannson@gmail.com"
diff --git a/people/alercah.toml b/people/alercah.toml
index 31a194282..031f8dbf5 100644
--- a/people/alercah.toml
+++ b/people/alercah.toml
@@ -3,4 +3,3 @@ github = "alercah"
 github-id = 20842325
 # email = "alercah@gmail.com"
 email = false
-
diff --git a/people/bkoropoff.toml b/people/bkoropoff.toml
index 310427654..116f60d94 100644
--- a/people/bkoropoff.toml
+++ b/people/bkoropoff.toml
@@ -2,4 +2,3 @@ name = "Brian Koropoff"
 github = "bkoropoff"
 github-id = 2101303
 email = "bkoropoff@gmail.com"
-
diff --git a/people/brson.toml b/people/brson.toml
index 12bc8d207..5b689bc39 100644
--- a/people/brson.toml
+++ b/people/brson.toml
@@ -3,4 +3,3 @@ github = "brson"
 github-id = 147214
 # email = "andersrb@gmail.com"
 email = false
-
diff --git a/people/burakemir.toml b/people/burakemir.toml
index 8b91fa523..183eaa590 100644
--- a/people/burakemir.toml
+++ b/people/burakemir.toml
@@ -2,4 +2,3 @@ name = 'Burak Emir'
 github = 'burakemir'
 github-id = 10248140
 zulip-id = 638751
-
diff --git a/people/cratelyn.toml b/people/cratelyn.toml
index 5e8311edc..dec9329fe 100644
--- a/people/cratelyn.toml
+++ b/people/cratelyn.toml
@@ -1,4 +1,4 @@
 name = 'Katelyn Martin'
 github = 'cratelyn'
 github-id = 57912822
-zulip-id = 327458 
+zulip-id = 327458
diff --git a/people/dotdash.toml b/people/dotdash.toml
index 73b6fca27..b7b0b66d2 100644
--- a/people/dotdash.toml
+++ b/people/dotdash.toml
@@ -3,4 +3,3 @@ github = "dotdash"
 github-id = 230962
 irc = "doener"
 email = "bsteinbr@gmail.com"
-
diff --git a/people/ecstatic-morse.toml b/people/ecstatic-morse.toml
index 9da5eaeb5..deaadd14e 100644
--- a/people/ecstatic-morse.toml
+++ b/people/ecstatic-morse.toml
@@ -1,4 +1,4 @@
 name = 'Dylan MacKenzie'
 github = 'ecstatic-morse'
 github-id = 29463364
-email = "ecstaticmorse@gmail.com"
\ No newline at end of file
+email = "ecstaticmorse@gmail.com"
diff --git a/people/erlend_sh.toml b/people/erlend_sh.toml
index da6f3359a..6c0f8ac64 100644
--- a/people/erlend_sh.toml
+++ b/people/erlend_sh.toml
@@ -1,4 +1,4 @@
 name = "Erlend Sogge Heggen"
 github = "erlend-sh"
 github-id = 583842
-email = "e.soghe@gmail.com"
\ No newline at end of file
+email = "e.soghe@gmail.com"
diff --git a/people/heyrutvik.toml b/people/heyrutvik.toml
index 5735d6f1a..d4a9badfd 100644
--- a/people/heyrutvik.toml
+++ b/people/heyrutvik.toml
@@ -1,4 +1,4 @@
 name = 'Rutvik Patel'
 github = 'heyrutvik'
 github-id = 6268538
-email = "heyrutvik@gmail.com"
\ No newline at end of file
+email = "heyrutvik@gmail.com"
diff --git a/people/huonw.toml b/people/huonw.toml
index e7a490aac..4c7f18d83 100644
--- a/people/huonw.toml
+++ b/people/huonw.toml
@@ -3,4 +3,3 @@ github = "huonw"
 github-id = 1203825
 irc = "huon"
 email = "dbau.pp@gmail.com"
-
diff --git a/people/jseyfried.toml b/people/jseyfried.toml
index 6f2fe4fc0..67629b0c1 100644
--- a/people/jseyfried.toml
+++ b/people/jseyfried.toml
@@ -3,4 +3,3 @@ github = "jseyfried"
 github-id = 8652869
 irc = "jseyfried"
 email = "jeffrey.seyfried@gmail.com"
-
diff --git a/people/kvark.toml b/people/kvark.toml
index ccecb09d5..b4b253401 100644
--- a/people/kvark.toml
+++ b/people/kvark.toml
@@ -2,4 +2,3 @@ name = "Dzmitry Malyshau"
 github = "kvark"
 github-id = 107301
 email = "kvark@mozilla.com"
-
diff --git a/people/lqd.toml b/people/lqd.toml
index 359ab617d..9486e7e6a 100644
--- a/people/lqd.toml
+++ b/people/lqd.toml
@@ -2,4 +2,3 @@ name = "Rémy Rakic"
 github = "lqd"
 github-id = 247183
 email = "remy.rakic+rust@gmail.com"
-
diff --git a/people/mariannegoldin.toml b/people/mariannegoldin.toml
index 680417257..b416a05b6 100644
--- a/people/mariannegoldin.toml
+++ b/people/mariannegoldin.toml
@@ -1,4 +1,4 @@
 name = 'M Goldin'
 github = 'mariannegoldin'
 github-id = 23177337
-email = 'marianne.goldin@gmail.com'
\ No newline at end of file
+email = 'marianne.goldin@gmail.com'
diff --git a/people/mcarton.toml b/people/mcarton.toml
index d81d3c88b..c63fef24b 100644
--- a/people/mcarton.toml
+++ b/people/mcarton.toml
@@ -2,4 +2,3 @@ name = "Martin Carton"
 github = "mcarton"
 github-id = 3751788
 email = "cartonmartin@gmail.com"
-
diff --git a/people/mdtro.toml b/people/mdtro.toml
index b69a1b518..79b1262be 100644
--- a/people/mdtro.toml
+++ b/people/mdtro.toml
@@ -3,4 +3,4 @@ github = 'mdtro'
 github-id = 20070360
 email = 'me@mdtro.dev'
 zulip-id = 502019
-discord-id = 129056090401931264
\ No newline at end of file
+discord-id = 129056090401931264
diff --git a/people/mmilenko.toml b/people/mmilenko.toml
index 3c88b4749..68d281611 100644
--- a/people/mmilenko.toml
+++ b/people/mmilenko.toml
@@ -1,4 +1,4 @@
 name = 'Miodrag Milenković'
 github = 'mmilenko'
 github-id = 10790773
-email = "miodrag.milenkovic@gmail.com"
\ No newline at end of file
+email = "miodrag.milenkovic@gmail.com"
diff --git a/people/pcwalton.toml b/people/pcwalton.toml
index ee641af69..fde6ca4ad 100644
--- a/people/pcwalton.toml
+++ b/people/pcwalton.toml
@@ -2,4 +2,3 @@ name = "Patrick Walton"
 github = "pcwalton"
 github-id = 157897
 email = "pcwalton@mimiga.net"
-
diff --git a/people/tomprince.toml b/people/tomprince.toml
index 561a4849d..d27975ab0 100644
--- a/people/tomprince.toml
+++ b/people/tomprince.toml
@@ -2,4 +2,3 @@ name = "Tom Prince"
 github = "tomprince"
 github-id = 283816
 email = "tom.prince@twistedmatrix.com"
-
diff --git a/people/xacrimon.toml b/people/xacrimon.toml
index 0b2f1a862..56fd743bd 100644
--- a/people/xacrimon.toml
+++ b/people/xacrimon.toml
@@ -1,4 +1,4 @@
- name = "Joel Wejdenstål"
+name = "Joel Wejdenstål"
 email = "joel.wejdenstal@gmail.com"
 github = "xacrimon"
 github-id = 21025159
diff --git a/repos/rust-lang/testing-devex-team.toml b/repos/rust-lang/testing-devex-team.toml
index 680ec5678..9a1a5fabc 100644
--- a/repos/rust-lang/testing-devex-team.toml
+++ b/repos/rust-lang/testing-devex-team.toml
@@ -1,7 +1,7 @@
 org = "rust-lang"
 name = "testing-devex-team"
 description = "Home of the Rust Testing DevEx team"
-bots = ["rustbot","rfcbot"]
+bots = ["rustbot", "rfcbot"]
 
 [access.teams]
 testing-devex = "maintain"
diff --git a/repos/rust-lang/unsafe-code-guidelines.toml b/repos/rust-lang/unsafe-code-guidelines.toml
index 18e5594f8..b5bbd9487 100644
--- a/repos/rust-lang/unsafe-code-guidelines.toml
+++ b/repos/rust-lang/unsafe-code-guidelines.toml
@@ -1,7 +1,7 @@
 org = 'rust-lang'
 name = 'unsafe-code-guidelines'
 description = "Forum for discussion about what unsafe code can and can't do"
-bots = ["rustbot","rfcbot"]
+bots = ["rustbot", "rfcbot"]
 
 [access.teams]
 opsem = 'maintain'
diff --git a/teams/archive/interim-leadership-chat.toml b/teams/archive/interim-leadership-chat.toml
index a7a188844..b2512de0f 100644
--- a/teams/archive/interim-leadership-chat.toml
+++ b/teams/archive/interim-leadership-chat.toml
@@ -33,4 +33,3 @@ orgs = ["rust-lang"]
 label = "T-interim-leadership-chat"
 name = "Interim Leadership Chat"
 ping = "rust-lang/interim-leadership-chat"
-
diff --git a/teams/archive/wg-governance.toml b/teams/archive/wg-governance.toml
index 07980f80e..dfe1fe4e4 100644
--- a/teams/archive/wg-governance.toml
+++ b/teams/archive/wg-governance.toml
@@ -7,7 +7,7 @@ leads = []
 members = []
 alumni = [
     "gnunicorn",
-    "valgrimm"
+    "valgrimm",
 ]
 
 [[lists]]
diff --git a/teams/arm.toml b/teams/arm.toml
index 5ff9d09fe..03d89d7b7 100644
--- a/teams/arm.toml
+++ b/teams/arm.toml
@@ -10,5 +10,5 @@ members = [
     "hug-dev",
 ]
 included-teams = [
-    "arm-maintainers"
+    "arm-maintainers",
 ]
diff --git a/teams/bootstrap.toml b/teams/bootstrap.toml
index ed81e2fa8..18878ee6e 100644
--- a/teams/bootstrap.toml
+++ b/teams/bootstrap.toml
@@ -10,7 +10,7 @@ members = [
     "clubby789",
 ]
 alumni = [
-    "jyn514"
+    "jyn514",
 ]
 
 [permissions]
diff --git a/teams/cargo.toml b/teams/cargo.toml
index 912558c19..4c118acad 100644
--- a/teams/cargo.toml
+++ b/teams/cargo.toml
@@ -10,7 +10,7 @@ members = [
     "weihanglo",
     "epage",
     "Muscraft",
-    "arlosi"
+    "arlosi",
 ]
 alumni = [
     "alexcrichton",
diff --git a/teams/clippy.toml b/teams/clippy.toml
index a7ad4bd41..08560da5c 100644
--- a/teams/clippy.toml
+++ b/teams/clippy.toml
@@ -43,7 +43,7 @@ zulip-stream = "clippy"
 repo = "https://github.com/rust-lang/rust-clippy"
 
 [[lists]]
-address="clippy@rust-lang.org"
+address = "clippy@rust-lang.org"
 
 [[zulip-groups]]
 name = "T-clippy"
diff --git a/teams/cloud-compute.toml b/teams/cloud-compute.toml
index d1a8d7e66..affad06b9 100644
--- a/teams/cloud-compute.toml
+++ b/teams/cloud-compute.toml
@@ -25,5 +25,5 @@ members = [
 dev-desktop = true
 
 [[github]]
-team-name = "cloud-compute-team"  # The name of the GitHub team (optional)
+team-name = "cloud-compute-team" # The name of the GitHub team (optional)
 orgs = ["rust-lang"]
diff --git a/teams/community-localization.toml b/teams/community-localization.toml
index de448a533..fb3547ec7 100644
--- a/teams/community-localization.toml
+++ b/teams/community-localization.toml
@@ -6,7 +6,7 @@ leads = ["vertexclique", "Manishearth"]
 members = [
     "Manishearth",
     "JohnTitor",
-    "vertexclique"
+    "vertexclique",
 ]
 alumni = [
     "sebasmagri",
diff --git a/teams/community.toml b/teams/community.toml
index 6b3d1685c..b8b17b7f1 100644
--- a/teams/community.toml
+++ b/teams/community.toml
@@ -62,7 +62,7 @@ address = "rustbridge@rust-lang.org"
 include-team-members = false
 extra-people = [
     "shadows-withal",
-    "arshiamufti"
+    "arshiamufti",
 ]
 
 [[lists]]
diff --git a/teams/compiler-contributors.toml b/teams/compiler-contributors.toml
index 8bf73362e..35f9ed3d1 100644
--- a/teams/compiler-contributors.toml
+++ b/teams/compiler-contributors.toml
@@ -4,34 +4,34 @@ subteam-of = "compiler"
 [people]
 leads = []
 members = [
-  "apiraino",
-  "b-naber",
-  "bjorn3",
-  "BoxyUwU",
-  "chenyukang",
-  "cuviper",
-  "durin42",
-  "eholk",
-  "est31",
-  "fee1-dead",
-  "flodiebold",
-  "fmease",
-  "lqd",
-  "Mark-Simulacrum",
-  "Nadrieril",
-  "Nilstrieb",
-  "nikic",
-  "nikomatsakis",
-  "nnethercote",
-  "RalfJung",
-  "saethlin",
-  "SparrowLii",
-  "spastorino",
-  "the8472",
-  "tmandry",
-  "tmiasko",
-  "TaKO8Ki",
-  "WaffleLapkin",
+    "apiraino",
+    "b-naber",
+    "bjorn3",
+    "BoxyUwU",
+    "chenyukang",
+    "cuviper",
+    "durin42",
+    "eholk",
+    "est31",
+    "fee1-dead",
+    "flodiebold",
+    "fmease",
+    "lqd",
+    "Mark-Simulacrum",
+    "Nadrieril",
+    "Nilstrieb",
+    "nikic",
+    "nikomatsakis",
+    "nnethercote",
+    "RalfJung",
+    "saethlin",
+    "SparrowLii",
+    "spastorino",
+    "the8472",
+    "tmandry",
+    "tmiasko",
+    "TaKO8Ki",
+    "WaffleLapkin",
 ]
 alumni = [
     "Centril",
diff --git a/teams/compiler.toml b/teams/compiler.toml
index 898e7c07a..1bc42b675 100644
--- a/teams/compiler.toml
+++ b/teams/compiler.toml
@@ -91,5 +91,5 @@ extra-people = [
     "bjorn3",
     "Xanewok",
     "nellshamrell",
-    "jackh726"
+    "jackh726",
 ]
diff --git a/teams/crate-maintainers.toml b/teams/crate-maintainers.toml
index bfa322722..05dbd4f0a 100644
--- a/teams/crate-maintainers.toml
+++ b/teams/crate-maintainers.toml
@@ -4,15 +4,15 @@ subteam-of = "libs"
 [people]
 leads = []
 members = [
-  "Amanieu",
-  "JohnTitor",
-  "KodrAus",
-  "joshtriplett",
-  "the8472",
-  "thomcc",
-  "workingjubilee",
-  "ChrisDenton",
-  "Byron",
+    "Amanieu",
+    "JohnTitor",
+    "KodrAus",
+    "joshtriplett",
+    "the8472",
+    "thomcc",
+    "workingjubilee",
+    "ChrisDenton",
+    "Byron",
 ]
 alumni = []
 
diff --git a/teams/libs-contributors.toml b/teams/libs-contributors.toml
index 218abae52..a6cc4885b 100644
--- a/teams/libs-contributors.toml
+++ b/teams/libs-contributors.toml
@@ -4,21 +4,21 @@ subteam-of = "libs"
 [people]
 leads = []
 members = [
-  "cramertj",
-  "dtolnay",
-  "JohnTitor",
-  "kennytm",
-  "KodrAus",
-  "Mark-Simulacrum",
-  "SimonSapin",
-  "workingjubilee",
-  "ChrisDenton",
-  "sunfishcode",
-  "yaahc",
-  "Nilstrieb",
+    "cramertj",
+    "dtolnay",
+    "JohnTitor",
+    "kennytm",
+    "KodrAus",
+    "Mark-Simulacrum",
+    "SimonSapin",
+    "workingjubilee",
+    "ChrisDenton",
+    "sunfishcode",
+    "yaahc",
+    "Nilstrieb",
 ]
 alumni = [
-  "shepmaster",
+    "shepmaster",
 ]
 
 [permissions]
diff --git a/teams/libs.toml b/teams/libs.toml
index 323695f92..62d3345cd 100644
--- a/teams/libs.toml
+++ b/teams/libs.toml
@@ -2,19 +2,19 @@ name = "libs"
 
 [people]
 leads = [
-  "m-ou-se",
-  "Amanieu",
+    "m-ou-se",
+    "Amanieu",
 ]
 members = [
-  "Amanieu",
-  "m-ou-se",
-  "joshtriplett",
-  "cuviper",
-  "the8472",
-  "thomcc",
+    "Amanieu",
+    "m-ou-se",
+    "joshtriplett",
+    "cuviper",
+    "the8472",
+    "thomcc",
 ]
 alumni = [
-  "yaahc",
+    "yaahc",
 ]
 
 [[github]]
diff --git a/teams/mods-discord.toml b/teams/mods-discord.toml
index 9de3f21c8..b6076feeb 100644
--- a/teams/mods-discord.toml
+++ b/teams/mods-discord.toml
@@ -6,7 +6,7 @@ leads = []
 members = [
     "sgrif",
     "technetos",
-    "Manishearth"
+    "Manishearth",
 ]
 alumni = [
     "Centril",
diff --git a/teams/opsem.toml b/teams/opsem.toml
index 6e00c80a1..499060dd3 100644
--- a/teams/opsem.toml
+++ b/teams/opsem.toml
@@ -26,7 +26,7 @@ ping = "rust-lang/opsem"
 [[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
 
-[[zulip-groups]] 
+[[zulip-groups]]
 name = "T-opsem"
 
 [[zulip-groups]]
diff --git a/teams/project-const-generics.toml b/teams/project-const-generics.toml
index 0e87f8ad3..ae9cdc6cc 100644
--- a/teams/project-const-generics.toml
+++ b/teams/project-const-generics.toml
@@ -5,15 +5,15 @@ subteam-of = "lang"
 [people]
 leads = ["lcnr", "nikomatsakis"]
 members = [
-        "lcnr",
-        "nikomatsakis",
-        "varkor",
-        "davidtwco",
-        "oli-obk",
-        "BoxyUwU",
+    "lcnr",
+    "nikomatsakis",
+    "varkor",
+    "davidtwco",
+    "oli-obk",
+    "BoxyUwU",
 ]
 alumni = [
-        "withoutboats",
+    "withoutboats",
 ]
 
 [website]
diff --git a/teams/project-edition-2024.toml b/teams/project-edition-2024.toml
index 5a9bb145a..5e4d4dc40 100644
--- a/teams/project-edition-2024.toml
+++ b/teams/project-edition-2024.toml
@@ -5,7 +5,7 @@ subteam-of = "leadership-council"
 [people]
 leads = [
     "bstrie",
-    "ehuss"
+    "ehuss",
 ]
 members = [
     "bstrie",
diff --git a/teams/project-group-leads.toml b/teams/project-group-leads.toml
index 5929c20cc..0d0d54577 100644
--- a/teams/project-group-leads.toml
+++ b/teams/project-group-leads.toml
@@ -7,4 +7,4 @@ members = []
 include-project-group-leads = true
 
 [[github]]
-orgs = ["rust-lang"]
\ No newline at end of file
+orgs = ["rust-lang"]
diff --git a/teams/project-stable-mir.toml b/teams/project-stable-mir.toml
index 5ed856e29..53c24fd41 100644
--- a/teams/project-stable-mir.toml
+++ b/teams/project-stable-mir.toml
@@ -5,14 +5,14 @@ subteam-of = "compiler"
 [people]
 leads = [
     "celinval",
-    "pnkfelix"
+    "pnkfelix",
 ]
 members = [
     "celinval",
     "oli-obk",
     "pnkfelix",
     "ouz-a",
-    "spastorino"
+    "spastorino",
 ]
 alumni = []
 
diff --git a/teams/rustdoc-contributors.toml b/teams/rustdoc-contributors.toml
index 203b3f4b8..3832dfd36 100644
--- a/teams/rustdoc-contributors.toml
+++ b/teams/rustdoc-contributors.toml
@@ -4,7 +4,7 @@ subteam-of = "rustdoc"
 [people]
 leads = []
 members = [
-    "fmease"
+    "fmease",
 ]
 alumni = []
 
diff --git a/teams/spec.toml b/teams/spec.toml
index 89a1053db..db1e2b956 100644
--- a/teams/spec.toml
+++ b/teams/spec.toml
@@ -6,7 +6,7 @@ leads = ["pnkfelix", "m-ou-se"]
 members = [
     "pnkfelix",
     "m-ou-se",
-    { github =  "JoelMarcey", roles = ["spec-editor"] },
+    { github = "JoelMarcey", roles = ["spec-editor"] },
     "ehuss",
 ]
 alumni = []
diff --git a/teams/style.toml b/teams/style.toml
index ff645d0b6..878530983 100644
--- a/teams/style.toml
+++ b/teams/style.toml
@@ -43,4 +43,3 @@ address = "style@rust-lang.org"
 
 [[lists]]
 address = "style-team@rust-lang.org"
-
diff --git a/teams/triagebot.toml b/teams/triagebot.toml
index 39deec9c3..906671ad0 100644
--- a/teams/triagebot.toml
+++ b/teams/triagebot.toml
@@ -6,7 +6,7 @@ leads = ["Mark-Simulacrum"]
 members = [
     "Mark-Simulacrum",
     "ehuss",
-    "jackh726"
+    "jackh726",
 ]
 alumni = [
     "spastorino",
diff --git a/teams/twir-reviewers.toml b/teams/twir-reviewers.toml
index a60a5fd61..751dfc459 100644
--- a/teams/twir-reviewers.toml
+++ b/teams/twir-reviewers.toml
@@ -11,7 +11,7 @@ members = [
     "extrawurst",
     "andrewpollack",
     "mariannegoldin",
-    "U007D"
+    "U007D",
 ]
 alumni = []
 
diff --git a/teams/types.toml b/teams/types.toml
index 34d94fa54..98b563f22 100644
--- a/teams/types.toml
+++ b/teams/types.toml
@@ -31,7 +31,7 @@ ping = "rust-lang/types"
 [[github]]
 orgs = ["rust-lang", "rust-lang-nursery"]
 
-[[zulip-groups]] 
+[[zulip-groups]]
 name = "T-types"
 
 [[zulip-groups]]
diff --git a/teams/vim.toml b/teams/vim.toml
index 211f61c56..beec1b399 100644
--- a/teams/vim.toml
+++ b/teams/vim.toml
@@ -5,7 +5,7 @@ kind = "marker-team"
 leads = []
 members = [
     "da-x",
-    "chris-morgan"
+    "chris-morgan",
 ]
 
 [[github]]
diff --git a/teams/wg-allocators.toml b/teams/wg-allocators.toml
index d0c13f460..48b6450a9 100644
--- a/teams/wg-allocators.toml
+++ b/teams/wg-allocators.toml
@@ -4,7 +4,7 @@ subteam-of = "libs"
 
 [people]
 leads = [
-    "TimDiekmann"
+    "TimDiekmann",
 ]
 members = [
     "Amanieu",
@@ -12,7 +12,7 @@ members = [
     "Lokathor",
     "scottjmaddox",
     "TimDiekmann",
-    "Wodann"
+    "Wodann",
 ]
 alumni = []
 
diff --git a/teams/wg-async.toml b/teams/wg-async.toml
index cf38d3106..0c35608cf 100644
--- a/teams/wg-async.toml
+++ b/teams/wg-async.toml
@@ -5,38 +5,38 @@ kind = "working-group"
 [people]
 leads = ["nikomatsakis", "tmandry"]
 members = [
-  "compiler-errors",
-  "eholk",
-  "estebank",
-  "guswynn",
-  "michaelwoerister",
-  "nikomatsakis",
-  "nrc",
-  "pnkfelix",
-  "taiki-e",
-  "tmandry",
-  "traviscross",
-  "vincenzopalazzo",
-  "yoshuawuyts",
+    "compiler-errors",
+    "eholk",
+    "estebank",
+    "guswynn",
+    "michaelwoerister",
+    "nikomatsakis",
+    "nrc",
+    "pnkfelix",
+    "taiki-e",
+    "tmandry",
+    "traviscross",
+    "vincenzopalazzo",
+    "yoshuawuyts",
 ]
 alumni = [
-  "Aaron1011",
-  "LucioFranco",
-  "MajorBreakfast",
-  "bIgBV",
-  "betamos",
-  "cramertj",
-  "csmoe",
-  "doc-jones",
-  "eminence",
-  "emmanuelantony2000",
-  "gilescope",
-  "lbernick",
-  "nellshamrell",
-  "rylev",
-  "spastorino",
-  "withoutboats",
-  "zeenix",
+    "Aaron1011",
+    "LucioFranco",
+    "MajorBreakfast",
+    "bIgBV",
+    "betamos",
+    "cramertj",
+    "csmoe",
+    "doc-jones",
+    "eminence",
+    "emmanuelantony2000",
+    "gilescope",
+    "lbernick",
+    "nellshamrell",
+    "rylev",
+    "spastorino",
+    "withoutboats",
+    "zeenix",
 ]
 
 [[github]]
diff --git a/teams/wg-compiler-performance.toml b/teams/wg-compiler-performance.toml
index 29a12e246..47422c2e0 100644
--- a/teams/wg-compiler-performance.toml
+++ b/teams/wg-compiler-performance.toml
@@ -15,7 +15,7 @@ members = [
     "nnethercote",
 ]
 alumni = [
-    "wesleywiser"
+    "wesleywiser",
 ]
 
 [[github]]
diff --git a/teams/wg-const-eval.toml b/teams/wg-const-eval.toml
index a74ddaeef..2091eace4 100644
--- a/teams/wg-const-eval.toml
+++ b/teams/wg-const-eval.toml
@@ -11,7 +11,7 @@ members = [
     "fee1-dead",
 ]
 alumni = [
-    "ecstatic-morse"
+    "ecstatic-morse",
 ]
 
 [website]
diff --git a/teams/wg-debugging.toml b/teams/wg-debugging.toml
index 36de02a53..5572c64ae 100644
--- a/teams/wg-debugging.toml
+++ b/teams/wg-debugging.toml
@@ -8,10 +8,10 @@ members = [
     "davidtwco",
     "michaelwoerister",
     "pnkfelix",
-    "wesleywiser"
+    "wesleywiser",
 ]
 alumni = [
-    "Manishearth"
+    "Manishearth",
 ]
 
 [website]
diff --git a/teams/wg-diagnostics.toml b/teams/wg-diagnostics.toml
index 703629d45..3038c3165 100644
--- a/teams/wg-diagnostics.toml
+++ b/teams/wg-diagnostics.toml
@@ -5,12 +5,12 @@ kind = "working-group"
 [people]
 leads = ["estebank", "oli-obk"]
 members = [
-  "JohnTitor",
-  "TaKO8Ki",
-  "compiler-errors",
-  "davidtwco",
-  "estebank",
-  "oli-obk",
+    "JohnTitor",
+    "TaKO8Ki",
+    "compiler-errors",
+    "davidtwco",
+    "estebank",
+    "oli-obk",
 ]
 alumni = []
 
diff --git a/teams/wg-embedded-hal.toml b/teams/wg-embedded-hal.toml
index 78d02f556..63d704680 100644
--- a/teams/wg-embedded-hal.toml
+++ b/teams/wg-embedded-hal.toml
@@ -9,7 +9,7 @@ members = [
     "eldruin",
     "ryankurte",
     "therealprof",
-    "MabezDev"
+    "MabezDev",
 ]
 alumni = []
 
diff --git a/teams/wg-embedded-infra.toml b/teams/wg-embedded-infra.toml
index d21820c16..892757c00 100644
--- a/teams/wg-embedded-infra.toml
+++ b/teams/wg-embedded-infra.toml
@@ -17,4 +17,3 @@ description = "Managing infrastructure for wg-embedded"
 [[github]]
 orgs = ["rust-embedded"]
 team-name = "infrastructure"
-
diff --git a/teams/wg-embedded-libs.toml b/teams/wg-embedded-libs.toml
index bb6717800..167d7a726 100644
--- a/teams/wg-embedded-libs.toml
+++ b/teams/wg-embedded-libs.toml
@@ -7,7 +7,7 @@ leads = []
 members = [
     "Dirbaio",
     "newAM",
-    "reitermarkus"
+    "reitermarkus",
 ]
 alumni = []
 
diff --git a/teams/wg-embedded-linux.toml b/teams/wg-embedded-linux.toml
index 63eeef382..0518bb4ad 100644
--- a/teams/wg-embedded-linux.toml
+++ b/teams/wg-embedded-linux.toml
@@ -20,4 +20,3 @@ description = "The embedded Linux team develops and maintains the core of the em
 [[github]]
 orgs = ["rust-embedded"]
 team-name = "embedded-linux"
-
diff --git a/teams/wg-gamedev.toml b/teams/wg-gamedev.toml
index 407f3cd34..414d23d4b 100644
--- a/teams/wg-gamedev.toml
+++ b/teams/wg-gamedev.toml
@@ -17,7 +17,7 @@ members = [
     "ozkriff",
     "patchfx",
     "repi",
-    "Wodann"
+    "Wodann",
 ]
 alumni = []
 
diff --git a/teams/wg-macros.toml b/teams/wg-macros.toml
index 89b91c34c..60b810ec0 100644
--- a/teams/wg-macros.toml
+++ b/teams/wg-macros.toml
@@ -5,12 +5,12 @@ subteam-of = "compiler"
 [people]
 leads = ["vincenzopalazzo", "eholk"]
 members = [
-  "jhpratt",
-  "Veykril",
-  "CohenArthur",
-  "danielhenrymantilla",
-  "vincenzopalazzo",
-  "eholk",
+    "jhpratt",
+    "Veykril",
+    "CohenArthur",
+    "danielhenrymantilla",
+    "vincenzopalazzo",
+    "eholk",
 ]
 alumni = [
 ]
diff --git a/teams/wg-prioritization.toml b/teams/wg-prioritization.toml
index 03c1392e5..fab65cff1 100644
--- a/teams/wg-prioritization.toml
+++ b/teams/wg-prioritization.toml
@@ -31,7 +31,7 @@ alumni = [
     "djcarpe",
     "frxstrem",
     "jechasteen",
-    "mstallmo"
+    "mstallmo",
 ]
 
 [website]
@@ -54,5 +54,5 @@ excluded-people = [
     "camelid",
     "pnkfelix",
     "hkmatsumoto",
-    "inquisitivecrystal"
+    "inquisitivecrystal",
 ]
diff --git a/teams/wg-rfc-2229.toml b/teams/wg-rfc-2229.toml
index f48d03bdc..ecf477b2d 100644
--- a/teams/wg-rfc-2229.toml
+++ b/teams/wg-rfc-2229.toml
@@ -5,15 +5,15 @@ kind = "working-group"
 [people]
 leads = ["nikomatsakis", "matthewjasper"]
 members = [
-        "nikomatsakis",
-        "matthewjasper",
-        "arora-aman",
-        "Azhng",
-        "ChrisPardy",
-        "jenniferwills",
-        "logmosier",
-        "null-sleep",
-        "roxelo"
+    "nikomatsakis",
+    "matthewjasper",
+    "arora-aman",
+    "Azhng",
+    "ChrisPardy",
+    "jenniferwills",
+    "logmosier",
+    "null-sleep",
+    "roxelo",
 ]
 alumni = []
 
diff --git a/teams/wg-rustc-dev-guide.toml b/teams/wg-rustc-dev-guide.toml
index 286c702ec..673e0a507 100644
--- a/teams/wg-rustc-dev-guide.toml
+++ b/teams/wg-rustc-dev-guide.toml
@@ -12,7 +12,6 @@ members = [
     "tshepang",
 ]
 alumni = ["LeSeulArtichaut", "Nashenas88", "amanjeev", "chrissimpkins", "jyn514", "mark-i-m", "rylev", "togiberlin", "pierwill"]
-    
 
 [[github]]
 orgs = ["rust-lang"]
diff --git a/tests/static-api/people/user-0.toml b/tests/static-api/people/user-0.toml
index bd7919de2..e8a7751b0 100644
--- a/tests/static-api/people/user-0.toml
+++ b/tests/static-api/people/user-0.toml
@@ -3,4 +3,4 @@ github = 'user-0'
 github-id = 0
 email = 'user0@example.com'
 discord-id = 0
-zulip-id = 1234
\ No newline at end of file
+zulip-id = 1234
diff --git a/tests/static-api/people/user-4.toml b/tests/static-api/people/user-4.toml
index 3f7be0e88..04cc2943e 100644
--- a/tests/static-api/people/user-4.toml
+++ b/tests/static-api/people/user-4.toml
@@ -2,4 +2,3 @@ name = 'Fourth user'
 github = 'user-4'
 github-id = 4
 email = "user4@example.com"
-
diff --git a/tests/static-api/people/user-5.toml b/tests/static-api/people/user-5.toml
index 852ab5f08..d83b2288c 100644
--- a/tests/static-api/people/user-5.toml
+++ b/tests/static-api/people/user-5.toml
@@ -2,4 +2,3 @@ name = 'Fifth user'
 github = 'user-5'
 github-id = 5
 email = "user5@example.com"
-
diff --git a/tests/static-api/people/user-6.toml b/tests/static-api/people/user-6.toml
index 1fcd77bc7..51bdbe598 100644
--- a/tests/static-api/people/user-6.toml
+++ b/tests/static-api/people/user-6.toml
@@ -2,4 +2,3 @@ name = 'Sixth user'
 github = 'user-6'
 github-id = 6
 email = "user6@example.com"
-