finish importing mailing lists

14 files changed, 141 insertions, 162 deletions

diff --git a/mailmap.toml b/mailmap.toml
deleted file mode 100644
index 0438c42..0000000
--- a/mailmap.toml
+++ /dev/null
@@ -1,152 +0,0 @@
-[[lists]]
-address = 'embedded-wg@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "david@craven.ch",
-  "hanno@braun-robotics.com",
-  "james.munns@gmail.com",
-  "jcsoo@bobbin.io",
-  "jorge@japaric.io",
-  "jp@thejpster.org.uk",
-  "me@dylanmckay.io",
-  "pftbest@gmail.com",
-]
-
-[[lists]]
-address = 'net@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "aturon@mozilla.com",
-  "mark.simulacrum@gmail.com",
-  "bob@cloudflare.com",
-  "mail@josefbrandl.de",
-  "tinagma@gmail.com",
-  "coleman.mcfarland@gmail.com",
-  "aidanhs@cantab.net",
-  "dbarsky@amazon.com",
-  "inejge@gmail.com",
-  "bhargav.voleti93@gmail.com",
-  "azdle@azdle.net",
-  "yoshuawuyts@gmail.com",
-  "aajtodd@gmail.com",
-  "sfackler@gmail.com",
-  "hello@stephanbuys.com",
-  "wg-net@nemo157.com",
-  "gruberbastian@me.com",
-  "jsgf@fb.com",
-  "mail@jakub-kozlowski.com",
-  "michaeljkillough@gmail.com",
-  "sloretan@gmail.com",
-  "ashfordneil0@gmail.com",
-  "a@tj.id.au",
-  "yarnnd@gmail.com",
-  "eric@reichertconsulting.com",
-  "karimair@gmail.com",
-  "flo@andersground.net",
-  "rolf@zxcv.nl",
-  "jbcden@gmail.com",
-  "me@kleimkuhler.com",
-  "pierre.krieger1708@gmail.com",
-  "etryzelaar@google.com",
-  "contact@geoffroycouprie.com",
-  "eric@dattore.me",
-  "service@maksims.co",
-  "sriram@tinverse.com",
-  "yusuke.sasaki.nuem@gmail.com",
-  "ricky@hosfelt.io",
-  "alberto@albertocoscia.me",
-  "kulshrax@gmail.com",
-  "alec@mocatta.net",
-  "xenith@xenith.org",
-  "arve.knudsen@gmail.com",
-  "ben.e.saunders@gmail.com",
-  "pickfire@riseup.net",
-  "lkurusa@kernelstuff.org",
-  "armin.ronacher@active-4.com",
-]
-
-[[lists]]
-address = 'reach@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "ashley@integer32.com",
-  "carol.nichols@integer32.com",
-  "dhosfelt@mozilla.com",
-  "aidanhs@cantab.net",
-]
-
-[[lists]]
-address = 'rust-2018@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "acrichton@mozilla.com",
-  "nmatsakis@mozilla.com",
-  "nrc@mozilla.com",
-  "ashley@integer32.com",
-  "mark.simulacrum@gmail.com",
-  "twingoow@gmail.com",
-  "mail@oli-obk.de",
-  "killercup@gmail.com",
-  "steve@steveklabnik.com",
-  "japaricious@gmail.com",
-  "fitzgen@mozilla.com",
-  "aturon@mozilla.com",
-]
-
-[[lists]]
-address = 'rust-icci@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "mwoerister@mozilla.com",
-]
-
-[[lists]]
-address = 'rustbridge@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "ashley@integer32.com",
-  "amufti16@gmail.com",
-]
-
-[[lists]]
-address = 'twir@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "bogusandre@gmail.com",
-  "vikrant@webstream.io",
-]
-
-[[lists]]
-address = 'underhanded@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "rust-underhanded@googlegroups.com",
-]
-
-[[lists]]
-address = 'user-logos@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "acrichton@mozilla.com",
-  "wycats@gmail.com",
-  "steve@steveklabnik.com",
-  "dbau.pp@gmail.com",
-  "aturon@mozilla.com",
-  "nmatsakis@mozilla.com",
-]
-
-[[lists]]
-address = 'verification@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "rust-verification@googlegroups.com",
-]
-
-[[lists]]
-address = 'wasm@rust-lang.org'
-access_level = 'everyone'
-members = [
-  "acrichto@mozilla.com",
-  "aturon@mozilla.com",
-  "mgattozzi@gmail.com",
-]
diff --git a/people/japaric.toml b/people/japaric.toml
index ebb6eb4..9795bd1 100644
--- a/people/japaric.toml
+++ b/people/japaric.toml
@@ -1,3 +1,3 @@
 name = "Jorge Aparicio"
 github = "japaric"
-email = "japaricious@gmail.com"
+email = "jorge@japaric.io"
diff --git a/people/jonathandturner.toml b/people/jonathandturner.toml
index 5bf0629..8accd37 100644
--- a/people/jonathandturner.toml
+++ b/people/jonathandturner.toml
@@ -1,3 +1,4 @@
 name = "Jonathan Turner"
 github = "jonathandturner"
 irc-nickname = "jntrnr"
+email = "jonathan.d.turner@gmail.com"
diff --git a/people/jtgeibel.toml b/people/jtgeibel.toml
index 40ae3b4..35e2546 100644
--- a/people/jtgeibel.toml
+++ b/people/jtgeibel.toml
@@ -1,2 +1,3 @@
 name = "Justin Geibel"
 github = "jtgeibel"
+email = "jtgeibel@gmail.com"
diff --git a/people/matthieu-m.toml b/people/matthieu-m.toml
index 21b7f20..8f3f6c1 100644
--- a/people/matthieu-m.toml
+++ b/people/matthieu-m.toml
@@ -1,3 +1,4 @@
 name = "Matthieu M."
 github = "matthieu-m"
 irc-nickname = "matthieum"
+email = "matthieu.monrocq@gmail.com"
diff --git a/people/mbrubeck.toml b/people/mbrubeck.toml
index fe69a36..941a2d3 100644
--- a/people/mbrubeck.toml
+++ b/people/mbrubeck.toml
@@ -1,2 +1,3 @@
 name = "Matt Brubeck"
 github = "mbrubeck"
+email = "mbrubeck@limpet.net"
diff --git a/people/mgattozzi.toml b/people/mgattozzi.toml
new file mode 100644
index 0000000..ebe63cd
--- /dev/null
+++ b/people/mgattozzi.toml
@@ -0,0 +1,3 @@
+name = "Michael Gattozzi"
+github = "mgattozzi"
+email = "mgattozzi@gmail.com"
diff --git a/teams/all.toml b/teams/all.toml
index e12425a..47c0b47 100644
--- a/teams/all.toml
+++ b/teams/all.toml
@@ -25,3 +25,19 @@ access-level = "everyone"
 [[lists]]
 address = "team@rust-lang.org"
 access-level = "everyone"
+
+[[lists]]
+address = "underhanded@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-underhanded@googlegroups.com",
+]
+
+[[lists]]
+address = "verification@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-emails = [
+    "rust-verification@googlegroups.com",
+]
diff --git a/teams/community.toml b/teams/community.toml
index 18c0249..c20872a 100644
--- a/teams/community.toml
+++ b/teams/community.toml
@@ -42,3 +42,25 @@ extra-emails = [
     "rust-community@googlegroups.com",
     "varma.sunjay@gmail.com",
 ]
+
+[[lists]]
+address = "reach@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "ashleygwilliams",
+    "carols10cents",
+    "aidanhs",
+]
+extra-emails = [
+    "dhosfelt@mozilla.com",
+]
+
+[[lists]]
+address = "rustbridge@rust-lang.org"
+access-level = "everyone"
+include-team-members = false
+extra-people = [
+    "ashleygwilliams",
+    "arshiamufti",
+]
diff --git a/teams/core.toml b/teams/core.toml
index 280091b..285054b 100644
--- a/teams/core.toml
+++ b/teams/core.toml
@@ -29,6 +29,10 @@ address = "core-team@rust-lang.org"
 access-level = "everyone"
 
 [[lists]]
+address = "user-logos@rust-lang.org"
+access-level = "everyone"
+
+[[lists]]
 address = "legal@crates.io"
 access-level = "everyone"
 
diff --git a/teams/infra.toml b/teams/infra.toml
index a1b32f5..9eaae0e 100644
--- a/teams/infra.toml
+++ b/teams/infra.toml
@@ -23,23 +23,14 @@ email = "infra@rust-lang.org"
 [[lists]]
 address = "infra@rust-lang.org"
 access-level = "everyone"
-extra-people = [
-    "aturon",
-]
 
 [[lists]]
 address = "infra-team@rust-lang.org"
 access-level = "everyone"
-extra-people = [
-    "aturon",
-]
 
 [[lists]]
 address = "craterbot@rust-lang.org"
 access-level = "everyone"
-extra-people = [
-    "aturon",
-]
 
 [[lists]]
 address = "admin@rust-lang.org"
diff --git a/teams/wg-embedded.toml b/teams/wg-embedded.toml
new file mode 100644
index 0000000..76e2942
--- /dev/null
+++ b/teams/wg-embedded.toml
@@ -0,0 +1,20 @@
+name = "wg-embedded"
+
+[people]
+leads = ["japaric"]
+members = [
+    "japaric"
+]
+
+[[lists]]
+address = "embedded-wg@rust-lang.org"
+access-level = "everyone"
+extra-emails = [
+    "david@craven.ch",
+    "hanno@braun-robotics.com",
+    "james.munns@gmail.com",
+    "jcsoo@bobbin.io",
+    "jp@thejpster.org.uk",
+    "me@dylanmckay.io",
+    "pftbest@gmail.com",
+]
diff --git a/teams/wg-net.toml b/teams/wg-net.toml
new file mode 100644
index 0000000..f95494c
--- /dev/null
+++ b/teams/wg-net.toml
@@ -0,0 +1,61 @@
+name = "wg-net"
+
+[people]
+leads = ["withoutboats", "cramertj"]
+members = [
+    "withoutboats",
+    "cramertj",
+    "aturon",
+    "Mark-Simulacrum",
+    "aidanhs",
+    "sfackler",
+]
+
+[[lists]]
+address = "net@rust-lang.org"
+access-level = "everyone"
+extra-emails = [
+    "bob@cloudflare.com",
+    "mail@josefbrandl.de",
+    "tinagma@gmail.com",
+    "coleman.mcfarland@gmail.com",
+    "dbarsky@amazon.com",
+    "inejge@gmail.com",
+    "bhargav.voleti93@gmail.com",
+    "azdle@azdle.net",
+    "yoshuawuyts@gmail.com",
+    "aajtodd@gmail.com",
+    "hello@stephanbuys.com",
+    "wg-net@nemo157.com",
+    "gruberbastian@me.com",
+    "jsgf@fb.com",
+    "mail@jakub-kozlowski.com",
+    "michaeljkillough@gmail.com",
+    "sloretan@gmail.com",
+    "ashfordneil0@gmail.com",
+    "a@tj.id.au",
+    "yarnnd@gmail.com",
+    "eric@reichertconsulting.com",
+    "karimair@gmail.com",
+    "flo@andersground.net",
+    "rolf@zxcv.nl",
+    "jbcden@gmail.com",
+    "me@kleimkuhler.com",
+    "pierre.krieger1708@gmail.com",
+    "etryzelaar@google.com",
+    "contact@geoffroycouprie.com",
+    "eric@dattore.me",
+    "service@maksims.co",
+    "sriram@tinverse.com",
+    "yusuke.sasaki.nuem@gmail.com",
+    "ricky@hosfelt.io",
+    "alberto@albertocoscia.me",
+    "kulshrax@gmail.com",
+    "alec@mocatta.net",
+    "xenith@xenith.org",
+    "arve.knudsen@gmail.com",
+    "ben.e.saunders@gmail.com",
+    "pickfire@riseup.net",
+    "lkurusa@kernelstuff.org",
+    "armin.ronacher@active-4.com",
+]
diff --git a/teams/wg-wasm.toml b/teams/wg-wasm.toml
new file mode 100644
index 0000000..8788bbb
--- /dev/null
+++ b/teams/wg-wasm.toml
@@ -0,0 +1,10 @@
+name = "wg-wasm"
+
+[people]
+leads = ["fitzgen"]
+members = [
+    "fitzgen",
+    "alexcrichton",
+    "aturon",
+    "mgattozzi",
+]