From 7ef90ed3c2f20257df1228b7fab7348a4c37bb73 Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Sun, 5 Dec 2021 15:59:35 +0200
Subject: [PATCH 1/8] Renamed unclear variable names

---
 examples/2d/contributors.rs | 152 +++++++++++++++++++++---------------
 1 file changed, 87 insertions(+), 65 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 74040446aadbe..db6af0acf158f 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -64,7 +64,7 @@ fn setup(
     commands.spawn_bundle(OrthographicCameraBundle::new_2d());
     commands.spawn_bundle(UiCameraBundle::default());
 
-    let mut sel = ContributorSelection {
+    let mut contributor_selection = ContributorSelection {
         order: vec![],
         idx: 0,
     };
@@ -82,7 +82,7 @@ fn setup(
 
         let transform = Transform::from_xyz(pos.0, pos.1, 0.0);
 
-        let e = commands
+        let entity = commands
             .spawn()
             .insert_bundle((
                 Contributor { hue },
@@ -107,10 +107,10 @@ fn setup(
             })
             .id();
 
-        sel.order.push((name, e));
+        contributor_selection.order.push((name, entity));
     }
 
-    sel.order.shuffle(&mut rnd);
+    contributor_selection.order.shuffle(&mut rnd);
 
     commands.spawn_bundle((SelectTimer, Timer::from_seconds(SHOWCASE_TIMER_SECS, true)));
 
@@ -146,24 +146,24 @@ fn setup(
             ..Default::default()
         });
 
-    commands.insert_resource(sel);
+    commands.insert_resource(contributor_selection);
 }
 
 /// Finds the next contributor to display and selects the entity
 fn select_system(
     mut materials: ResMut<Assets<ColorMaterial>>,
-    mut sel: ResMut<ContributorSelection>,
-    mut dq: Query<&mut Text, With<ContributorDisplay>>,
-    mut tq: Query<&mut Timer, With<SelectTimer>>,
-    mut q: Query<(&Contributor, &Handle<ColorMaterial>, &mut Transform)>,
+    mut contributor_selection: ResMut<ContributorSelection>,
+    mut text_query: Query<&mut Text, With<ContributorDisplay>>,
+    mut timer_query: Query<&mut Timer, With<SelectTimer>>,
+    mut query: Query<(&Contributor, &Handle<ColorMaterial>, &mut Transform)>,
     time: Res<Time>,
 ) {
     let mut timer_fired = false;
-    for mut t in tq.iter_mut() {
-        if !t.tick(time.delta()).just_finished() {
+    for mut timer in timer_query.iter_mut() {
+        if !timer.tick(time.delta()).just_finished() {
             continue;
         }
-        t.reset();
+        timer.reset();
         timer_fired = true;
     }
 
@@ -171,26 +171,38 @@ fn select_system(
         return;
     }
 
-    let prev = sel.idx;
+    let prev = contributor_selection.idx;
 
-    if (sel.idx + 1) < sel.order.len() {
-        sel.idx += 1;
+    if (contributor_selection.idx + 1) < contributor_selection.order.len() {
+        contributor_selection.idx += 1;
     } else {
-        sel.idx = 0;
+        contributor_selection.idx = 0;
     }
 
     {
-        let (_, e) = &sel.order[prev];
-        if let Ok((c, handle, mut tr)) = q.get_mut(*e) {
-            deselect(&mut *materials, handle.clone(), c, &mut *tr);
+        let (_, entity) = &contributor_selection.order[prev];
+        if let Ok((contributor, handle, mut transform)) = query.get_mut(*entity) {
+            deselect(
+                &mut *materials,
+                handle.clone(),
+                contributor,
+                &mut *transform,
+            );
         }
     }
 
-    let (name, e) = &sel.order[sel.idx];
-
-    if let Ok((c, handle, mut tr)) = q.get_mut(*e) {
-        if let Some(mut text) = dq.iter_mut().next() {
-            select(&mut *materials, handle, c, &mut *tr, &mut *text, name);
+    let (name, entity) = &contributor_selection.order[contributor_selection.idx];
+
+    if let Ok((contributor, handle, mut transform)) = query.get_mut(*entity) {
+        if let Some(mut text) = text_query.iter_mut().next() {
+            select(
+                &mut *materials,
+                handle,
+                contributor,
+                &mut *transform,
+                &mut *text,
+                name,
+            );
         }
     }
 }
@@ -199,20 +211,25 @@ fn select_system(
 /// bring the object to the front and display the name.
 fn select(
     materials: &mut Assets<ColorMaterial>,
-    mat_handle: &Handle<ColorMaterial>,
-    cont: &Contributor,
-    trans: &mut Transform,
+    material_handle: &Handle<ColorMaterial>,
+    contributor: &Contributor,
+    transform: &mut Transform,
     text: &mut Text,
     name: &str,
 ) -> Option<()> {
-    let mat = materials.get_mut(mat_handle)?;
-    mat.color = Color::hsla(cont.hue, SATURATION_SELECTED, LIGHTNESS_SELECTED, ALPHA);
+    let material = materials.get_mut(material_handle)?;
+    material.color = Color::hsla(
+        contributor.hue,
+        SATURATION_SELECTED,
+        LIGHTNESS_SELECTED,
+        ALPHA,
+    );
 
-    trans.translation.z = 100.0;
+    transform.translation.z = 100.0;
 
     text.sections[0].value = "Contributor: ".to_string();
     text.sections[1].value = name.to_string();
-    text.sections[1].style.color = mat.color;
+    text.sections[1].style.color = material.color;
 
     Some(())
 }
@@ -221,24 +238,29 @@ fn select(
 /// the object to the back.
 fn deselect(
     materials: &mut Assets<ColorMaterial>,
-    mat_handle: Handle<ColorMaterial>,
-    cont: &Contributor,
-    trans: &mut Transform,
+    material_handle: Handle<ColorMaterial>,
+    contributor: &Contributor,
+    transform: &mut Transform,
 ) -> Option<()> {
-    let mat = materials.get_mut(mat_handle)?;
-    mat.color = Color::hsla(cont.hue, SATURATION_DESELECTED, LIGHTNESS_DESELECTED, ALPHA);
+    let material = materials.get_mut(material_handle)?;
+    material.color = Color::hsla(
+        contributor.hue,
+        SATURATION_DESELECTED,
+        LIGHTNESS_DESELECTED,
+        ALPHA,
+    );
 
-    trans.translation.z = 0.0;
+    transform.translation.z = 0.0;
 
     Some(())
 }
 
 /// Applies gravity to all entities with velocity
-fn velocity_system(time: Res<Time>, mut q: Query<&mut Velocity>) {
+fn velocity_system(time: Res<Time>, mut velocity_query: Query<&mut Velocity>) {
     let delta = time.delta_seconds();
 
-    for mut v in q.iter_mut() {
-        v.translation += Vec3::new(0.0, GRAVITY * delta, 0.0);
+    for mut velocity in velocity_query.iter_mut() {
+        velocity.translation += Vec3::new(0.0, GRAVITY * delta, 0.0);
     }
 }
 
@@ -248,55 +270,55 @@ fn velocity_system(time: Res<Time>, mut q: Query<&mut Velocity>) {
 /// velocity. On collision with the ground it applies an upwards
 /// force.
 fn collision_system(
-    wins: Res<Windows>,
-    mut q: Query<(&mut Velocity, &mut Transform), With<Contributor>>,
+    windows: Res<Windows>,
+    mut query: Query<(&mut Velocity, &mut Transform), With<Contributor>>,
 ) {
     let mut rnd = rand::thread_rng();
 
-    let win = wins.get_primary().unwrap();
+    let window = windows.get_primary().unwrap();
 
-    let ceiling = win.height() / 2.;
-    let ground = -(win.height() / 2.);
+    let ceiling = window.height() / 2.;
+    let ground = -(window.height() / 2.);
 
-    let wall_left = -(win.width() / 2.);
-    let wall_right = win.width() / 2.;
+    let wall_left = -(window.width() / 2.);
+    let wall_right = window.width() / 2.;
 
-    for (mut v, mut t) in q.iter_mut() {
-        let left = t.translation.x - SPRITE_SIZE / 2.0;
-        let right = t.translation.x + SPRITE_SIZE / 2.0;
-        let top = t.translation.y + SPRITE_SIZE / 2.0;
-        let bottom = t.translation.y - SPRITE_SIZE / 2.0;
+    for (mut velocity, mut transform) in query.iter_mut() {
+        let left = transform.translation.x - SPRITE_SIZE / 2.0;
+        let right = transform.translation.x + SPRITE_SIZE / 2.0;
+        let top = transform.translation.y + SPRITE_SIZE / 2.0;
+        let bottom = transform.translation.y - SPRITE_SIZE / 2.0;
 
         // clamp the translation to not go out of the bounds
         if bottom < ground {
-            t.translation.y = ground + SPRITE_SIZE / 2.0;
+            transform.translation.y = ground + SPRITE_SIZE / 2.0;
             // apply an impulse upwards
-            v.translation.y = rnd.gen_range(700.0..1000.0);
+            velocity.translation.y = rnd.gen_range(700.0..1000.0);
         }
         if top > ceiling {
-            t.translation.y = ceiling - SPRITE_SIZE / 2.0;
+            transform.translation.y = ceiling - SPRITE_SIZE / 2.0;
         }
         // on side walls flip the horizontal velocity
         if left < wall_left {
-            t.translation.x = wall_left + SPRITE_SIZE / 2.0;
-            v.translation.x *= -1.0;
-            v.rotation *= -1.0;
+            transform.translation.x = wall_left + SPRITE_SIZE / 2.0;
+            velocity.translation.x *= -1.0;
+            velocity.rotation *= -1.0;
         }
         if right > wall_right {
-            t.translation.x = wall_right - SPRITE_SIZE / 2.0;
-            v.translation.x *= -1.0;
-            v.rotation *= -1.0;
+            transform.translation.x = wall_right - SPRITE_SIZE / 2.0;
+            velocity.translation.x *= -1.0;
+            velocity.rotation *= -1.0;
         }
     }
 }
 
 /// Apply velocity to positions and rotations.
-fn move_system(time: Res<Time>, mut q: Query<(&Velocity, &mut Transform)>) {
+fn move_system(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
     let delta = time.delta_seconds();
 
-    for (v, mut t) in q.iter_mut() {
-        t.translation += delta * v.translation;
-        t.rotate(Quat::from_rotation_z(v.rotation * delta));
+    for (velocity, mut transform) in query.iter_mut() {
+        transform.translation += delta * velocity.translation;
+        transform.rotate(Quat::from_rotation_z(velocity.rotation * delta));
     }
 }
 

From adad7c3ea229a3fa0fd3e71ec55a76360e7e611b Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Sun, 5 Dec 2021 16:00:29 +0200
Subject: [PATCH 2/8] Splitted setup system into two separate systems

---
 examples/2d/contributors.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index db6af0acf158f..bf01626b16d11 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -9,6 +9,7 @@ use std::{
 fn main() {
     App::new()
         .add_plugins(DefaultPlugins)
+        .add_startup_system(setup_contributor_selection)
         .add_startup_system(setup)
         .add_system(velocity_system)
         .add_system(move_system)
@@ -52,7 +53,7 @@ const ALPHA: f32 = 0.92;
 
 const SHOWCASE_TIMER_SECS: f32 = 3.0;
 
-fn setup(
+fn setup_contributor_selection(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
     mut materials: ResMut<Assets<ColorMaterial>>,
@@ -61,9 +62,6 @@ fn setup(
 
     let texture_handle = asset_server.load("branding/icon.png");
 
-    commands.spawn_bundle(OrthographicCameraBundle::new_2d());
-    commands.spawn_bundle(UiCameraBundle::default());
-
     let mut contributor_selection = ContributorSelection {
         order: vec![],
         idx: 0,
@@ -112,6 +110,13 @@ fn setup(
 
     contributor_selection.order.shuffle(&mut rnd);
 
+    commands.insert_resource(contributor_selection);
+}
+
+fn setup(mut commands: Commands, asset_server: Res<AssetServer>) {
+    commands.spawn_bundle(OrthographicCameraBundle::new_2d());
+    commands.spawn_bundle(UiCameraBundle::default());
+
     commands.spawn_bundle((SelectTimer, Timer::from_seconds(SHOWCASE_TIMER_SECS, true)));
 
     commands
@@ -145,8 +150,6 @@ fn setup(
             },
             ..Default::default()
         });
-
-    commands.insert_resource(contributor_selection);
 }
 
 /// Finds the next contributor to display and selects the entity

From 6ec10a0bc2dd1fea4ab323321443bb788df1ca3a Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Sun, 5 Dec 2021 22:52:38 +0200
Subject: [PATCH 3/8] Added error handling and default values

---
 examples/2d/contributors.rs | 342 +++++++++++++++++++++++++++++++++++-
 1 file changed, 333 insertions(+), 9 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index bf01626b16d11..c79aafaf20761 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -2,7 +2,8 @@ use bevy::prelude::*;
 use rand::{prelude::SliceRandom, Rng};
 use std::{
     collections::BTreeSet,
-    io::{BufRead, BufReader},
+    env::VarError,
+    io::{self, BufRead, BufReader},
     process::Stdio,
 };
 
@@ -42,6 +43,12 @@ struct Velocity {
     rotation: f32,
 }
 
+enum LoadContributorsError {
+    IOError(io::Error),
+    VarError(VarError),
+    StdoutError,
+}
+
 const GRAVITY: f32 = -9.821 * 100.0;
 const SPRITE_SIZE: f32 = 75.0;
 
@@ -53,12 +60,324 @@ const ALPHA: f32 = 0.92;
 
 const SHOWCASE_TIMER_SECS: f32 = 3.0;
 
+const CONTRIBUTORS_LIST: &[&str] = &[
+    "0x22fe",
+    "8bp",
+    "Aaron Housh",
+    "Aaron Winter",
+    "Adamaq01",
+    "Adam Bates",
+    "adekau",
+    "Aevyrie",
+    "Agorgianitis Loukas",
+    "Alec Deason",
+    "Alessandro Re",
+    "Alex",
+    "Alexander Krivács Schrøder",
+    "Alexander Sepity",
+    "Alex.F",
+    "Alex Hirsch",
+    "Alice Cecile",
+    "Alister Lee",
+    "Al M",
+    "aloucks",
+    "Amber Kowalski",
+    "Anders Rasmussen",
+    "andoco",
+    "Andreas Weibye",
+    "André Heringer",
+    "Andre Kuehne",
+    "Andre Popovitch",
+    "Andrew Hickman",
+    "AngelicosPhosphoros",
+    "Anselmo Sampietro",
+    "Archina",
+    "bg",
+    "bilsen",
+    "BimDav",
+    "bjorn3",
+    "Boiethios",
+    "Boutillier",
+    "Boxy",
+    "Bram Buurlage",
+    "caelunshun",
+    "Caleb Boylan",
+    "Callum Tolley",
+    "Cameron Hart",
+    "carter",
+    "Carter Anderson",
+    "Catherine Gilbert",
+    "CGMossa",
+    "Charles Giguere",
+    "Chris Janaqi",
+    "Christopher Durham",
+    "Chrs Msln",
+    "Claire C",
+    "ColonisationCaptain",
+    "Corey Farwell",
+    "Cory Forsstrom",
+    "CrazyRoka",
+    "Csányi István",
+    "Daniel Borges",
+    "Daniel Burrows",
+    "Daniel Jordaan",
+    "Daniel McNab",
+    "Dashiell Elliott",
+    "dataphract",
+    "David Ackerman",
+    "David McClung",
+    "davier",
+    "Denis Laprise",
+    "dependabot[bot]",
+    "deprilula28",
+    "DGriffin91",
+    "Digital Seven",
+    "Dimev",
+    "Dimitri Belopopsky",
+    "Dimitri Bobkov",
+    "dinococo",
+    "dintho",
+    "Downtime",
+    "Duncan",
+    "Dusty DeWeese",
+    "easynam",
+    "Elias",
+    "Emanuel Lindström",
+    "EthanYidong",
+    "Fabian Löschner",
+    "Fabian Würfl",
+    "Federico Rinaldi",
+    "Felipe Jorge",
+    "figsoda",
+    "FlyingRatBull",
+    "follower",
+    "forbjok",
+    "Forest Anderson",
+    "François",
+    "Freya",
+    "Fuyang Liu",
+    "Gab Campbell",
+    "GabLotus",
+    "Garett Cooper",
+    "Georg Friedrich Schuppe",
+    "Gilbert Röhrbein",
+    "giusdp",
+    "Grant Moyer",
+    "Gray Olson",
+    "Grayson Burton",
+    "Gregor",
+    "Gregory Oakes",
+    "Grindv1k",
+    "Guillaume DALLENNE",
+    "Guim Caballero",
+    "Halfwhit",
+    "Hans W. Uhlig",
+    "Hoidigan",
+    "Hugo Lindsay",
+    "HyperLightKitsune",
+    "Iaiao",
+    "ifletsomeclaire",
+    "Ilja Kartašov",
+    "iMplode nZ",
+    "Isaak Eriksson",
+    "Ixentus",
+    "Jackson Lango",
+    "Jacob Gardner",
+    "jak6jak",
+    "Jake Kerr",
+    "Jakob Hellermann",
+    "James Higgins",
+    "James Leflang",
+    "James Liu",
+    "James R",
+    "Jasen Borisov",
+    "Jay Oster",
+    "Jeremiah Senkpiel",
+    "Jerome Humbert",
+    "jngbsn",
+    "João Capucho",
+    "Joel Nordström",
+    "Johan Klokkhammer Helsing",
+    "John",
+    "John Doneth",
+    "John Mitchell",
+    "Jonas Matser",
+    "Jonathan Behrens",
+    "Jonathan Cornaz",
+    "Josh Kuhn",
+    "Josh Taylor",
+    "Joshua Chapman",
+    "Joshua J. Bouw",
+    "Joshua Ols",
+    "julhe",
+    "Julian Heinken",
+    "Junfeng Liu",
+    "kaflu",
+    "karroffel",
+    "Kenneth Dodrill",
+    "Klim Tsoutsman",
+    "Kurt Kühnert",
+    "Lachlan Sneff",
+    "lambdagolem",
+    "lee-orr",
+    "Léo Gillot-Lamure",
+    "Loch Wansbrough",
+    "Logan Collins",
+    "Logan Magee",
+    "Lucas Kent",
+    "Lucas Rocha",
+    "Lukas Orsvärn",
+    "Lukas Wirth",
+    "M",
+    "Marcel Müller",
+    "Marc Parenteau",
+    "Marcus Buffett",
+    "Marek Fajkus",
+    "Marek Legris",
+    "marius851000",
+    "Mariusz Kryński",
+    "Mark",
+    "Martin Lavoie",
+    "Martín Maita",
+    "Martin Svanberg",
+    "Mat Hostetter",
+    "Matteo Guglielmetti",
+    "Matthias Seiffert",
+    "Max Bruckner",
+    "maxwellodri",
+    "memoryruins",
+    "mfrancis107",
+    "MGlolenstine",
+    "Michael Hills",
+    "Michael Tang",
+    "Mika",
+    "Mikail Khan",
+    "Mike",
+    "Milan Vaško",
+    "milkybit",
+    "MinerSebas",
+    "Minghao Liu",
+    "MiniaczQ",
+    "Mirko Rainer",
+    "Moxinilian",
+    "MsK`",
+    "multun",
+    "Nathan Jeffords",
+    "Nathan Stocks",
+    "Nathan Ward",
+    "Nibor62",
+    "Nicholas Rishel",
+    "Nick",
+    "Nikita Zdanovitch",
+    "Niklas Eicker",
+    "Noah Callaway",
+    "Nolan Darilek",
+    "Olivier Pinon",
+    "OptimisticPeach",
+    "Oscar",
+    "Patrick Greene",
+    "Patrik Buhring",
+    "Paweł Grabarz",
+    "Philip Degarmo",
+    "Philipp Mildenberger",
+    "Piotr Balcer",
+    "Plecra",
+    "Protowalker",
+    "Psychoticpotato",
+    "r00ster",
+    "Raymond",
+    "RedlineTriad",
+    "reidbhuntley",
+    "Rémi Lauzier",
+    "Renato Caldas",
+    "Restioson",
+    "Richard Tjerngren",
+    "RiskLove",
+    "rmsthebest",
+    "Rob",
+    "Robbie Davenport",
+    "Robert Swain",
+    "Rob Parrett",
+    "rod-salazar",
+    "Ryan Lee",
+    "Ryan Scheel",
+    "sapir",
+    "sark",
+    "Saverio Miroddi",
+    "Schell Carl Scivally",
+    "sdfgeoff",
+    "Sergey Minakov",
+    "simens_green",
+    "simlay",
+    "Simon Guillot",
+    "Smite Rust",
+    "speak",
+    "Spencer Burris",
+    "Squirrel",
+    "StarArawn",
+    "stefee",
+    "Stjepan Glavina",
+    "SvenTS",
+    "szunami",
+    "taryn",
+    "TehPers",
+    "Telzhaak",
+    "TEMHOTAOKEAHA",
+    "terrarier2111",
+    "thebluefish",
+    "Theia Vogel",
+    "the-notable",
+    "Théo Degioanni",
+    "TheRawMeatball",
+    "therealstork",
+    "Thirds",
+    "Thomas Heartman",
+    "Thomas Herzog",
+    "Tiago Ferreira",
+    "tiagolam",
+    "tigregalis",
+    "Tomasz Sterna",
+    "Tom Bebb",
+    "Toniman20",
+    "Toothbrush",
+    "TotalKrill",
+    "Tristan Pemble",
+    "Utkarsh",
+    "Valentin",
+    "verzuz",
+    "Victor \"multun\" Collod",
+    "VitalyR",
+    "Vladyslav Batyrenko",
+    "VVishion",
+    "walterpie",
+    "Waridley",
+    "W. Brian Gourlie",
+    "Will Crichton",
+    "Will Dixon",
+    "Will Hart",
+    "William Batista",
+    "willolisp",
+    "Wojciech Olejnik",
+    "Wouter Buckens",
+    "Wouter Standaert",
+    "wyhaya",
+    "Xavientois",
+    "Yoh Deadfall",
+    "Zach Gotsch",
+    "Zaszi",
+    "Zhixing Zhang",
+    "Zicklag",
+    "Zooce",
+];
+
 fn setup_contributor_selection(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
     mut materials: ResMut<Assets<ColorMaterial>>,
 ) {
-    let contribs = contributors();
+    let contribs = contributors().unwrap_or(BTreeSet::from_iter(
+        CONTRIBUTORS_LIST.iter().map(|name| name.to_string()),
+    ));
 
     let texture_handle = asset_server.load("branding/icon.png");
 
@@ -330,21 +649,26 @@ fn move_system(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
 /// The names are deduplicated.
 /// This function only works if `git` is installed and
 /// the program is run through `cargo`.
-fn contributors() -> Contributors {
-    let manifest_dir = std::env::var("CARGO_MANIFEST_DIR")
-        .expect("This example needs to run through `cargo run --example`.");
+fn contributors() -> Result<Contributors, LoadContributorsError> {
+    let manifest_dir =
+        std::env::var("CARGO_MANIFEST_DIR").map_err(|err| LoadContributorsError::VarError(err))?;
 
     let mut cmd = std::process::Command::new("git")
         .args(&["--no-pager", "log", "--pretty=format:%an"])
         .current_dir(manifest_dir)
         .stdout(Stdio::piped())
         .spawn()
-        .expect("`git` needs to be installed.");
+        .map_err(|err| LoadContributorsError::IOError(err))?;
 
-    let stdout = cmd.stdout.take().expect("`Child` should have a stdout.");
+    let stdout = cmd
+        .stdout
+        .take()
+        .ok_or_else(|| LoadContributorsError::StdoutError)?;
 
-    BufReader::new(stdout)
+    let contributors = BufReader::new(stdout)
         .lines()
         .filter_map(|x| x.ok())
-        .collect()
+        .collect();
+
+    Ok(contributors)
 }

From 11abd5a1e9147d20a2494c40bdc3cc5cba83a14a Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Sun, 5 Dec 2021 23:25:55 +0200
Subject: [PATCH 4/8] Renamed error enumeration and fixed ci

---
 examples/2d/contributors.rs | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index c79aafaf20761..45a833015a5cf 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -44,9 +44,9 @@ struct Velocity {
 }
 
 enum LoadContributorsError {
-    IOError(io::Error),
-    VarError(VarError),
-    StdoutError,
+    IO(io::Error),
+    Var(VarError),
+    Stdout,
 }
 
 const GRAVITY: f32 = -9.821 * 100.0;
@@ -375,9 +375,9 @@ fn setup_contributor_selection(
     asset_server: Res<AssetServer>,
     mut materials: ResMut<Assets<ColorMaterial>>,
 ) {
-    let contribs = contributors().unwrap_or(BTreeSet::from_iter(
-        CONTRIBUTORS_LIST.iter().map(|name| name.to_string()),
-    ));
+    let contribs = contributors().unwrap_or_else(|_| {
+        BTreeSet::from_iter(CONTRIBUTORS_LIST.iter().map(|name| name.to_string()))
+    });
 
     let texture_handle = asset_server.load("branding/icon.png");
 
@@ -650,20 +650,16 @@ fn move_system(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
 /// This function only works if `git` is installed and
 /// the program is run through `cargo`.
 fn contributors() -> Result<Contributors, LoadContributorsError> {
-    let manifest_dir =
-        std::env::var("CARGO_MANIFEST_DIR").map_err(|err| LoadContributorsError::VarError(err))?;
+    let manifest_dir = std::env::var("CARGO_MANIFEST_DIR").map_err(LoadContributorsError::Var)?;
 
     let mut cmd = std::process::Command::new("git")
         .args(&["--no-pager", "log", "--pretty=format:%an"])
         .current_dir(manifest_dir)
         .stdout(Stdio::piped())
         .spawn()
-        .map_err(|err| LoadContributorsError::IOError(err))?;
+        .map_err(LoadContributorsError::IO)?;
 
-    let stdout = cmd
-        .stdout
-        .take()
-        .ok_or_else(|| LoadContributorsError::StdoutError)?;
+    let stdout = cmd.stdout.take().ok_or(LoadContributorsError::Stdout)?;
 
     let contributors = BufReader::new(stdout)
         .lines()

From 44e0ac6e6a496fb4d117c38c474beb3bb295ace4 Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Sun, 5 Dec 2021 23:43:42 +0200
Subject: [PATCH 5/8] Reduced contributors array and added docs

---
 examples/2d/contributors.rs | 313 +-----------------------------------
 1 file changed, 4 insertions(+), 309 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 45a833015a5cf..55a728c0d7289 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -19,6 +19,7 @@ fn main() {
         .run();
 }
 
+// Store contributors in a sorted collection that preserves the uniqueness
 type Contributors = BTreeSet<String>;
 
 struct ContributorSelection {
@@ -60,321 +61,15 @@ const ALPHA: f32 = 0.92;
 
 const SHOWCASE_TIMER_SECS: f32 = 3.0;
 
-const CONTRIBUTORS_LIST: &[&str] = &[
-    "0x22fe",
-    "8bp",
-    "Aaron Housh",
-    "Aaron Winter",
-    "Adamaq01",
-    "Adam Bates",
-    "adekau",
-    "Aevyrie",
-    "Agorgianitis Loukas",
-    "Alec Deason",
-    "Alessandro Re",
-    "Alex",
-    "Alexander Krivács Schrøder",
-    "Alexander Sepity",
-    "Alex.F",
-    "Alex Hirsch",
-    "Alice Cecile",
-    "Alister Lee",
-    "Al M",
-    "aloucks",
-    "Amber Kowalski",
-    "Anders Rasmussen",
-    "andoco",
-    "Andreas Weibye",
-    "André Heringer",
-    "Andre Kuehne",
-    "Andre Popovitch",
-    "Andrew Hickman",
-    "AngelicosPhosphoros",
-    "Anselmo Sampietro",
-    "Archina",
-    "bg",
-    "bilsen",
-    "BimDav",
-    "bjorn3",
-    "Boiethios",
-    "Boutillier",
-    "Boxy",
-    "Bram Buurlage",
-    "caelunshun",
-    "Caleb Boylan",
-    "Callum Tolley",
-    "Cameron Hart",
-    "carter",
-    "Carter Anderson",
-    "Catherine Gilbert",
-    "CGMossa",
-    "Charles Giguere",
-    "Chris Janaqi",
-    "Christopher Durham",
-    "Chrs Msln",
-    "Claire C",
-    "ColonisationCaptain",
-    "Corey Farwell",
-    "Cory Forsstrom",
-    "CrazyRoka",
-    "Csányi István",
-    "Daniel Borges",
-    "Daniel Burrows",
-    "Daniel Jordaan",
-    "Daniel McNab",
-    "Dashiell Elliott",
-    "dataphract",
-    "David Ackerman",
-    "David McClung",
-    "davier",
-    "Denis Laprise",
-    "dependabot[bot]",
-    "deprilula28",
-    "DGriffin91",
-    "Digital Seven",
-    "Dimev",
-    "Dimitri Belopopsky",
-    "Dimitri Bobkov",
-    "dinococo",
-    "dintho",
-    "Downtime",
-    "Duncan",
-    "Dusty DeWeese",
-    "easynam",
-    "Elias",
-    "Emanuel Lindström",
-    "EthanYidong",
-    "Fabian Löschner",
-    "Fabian Würfl",
-    "Federico Rinaldi",
-    "Felipe Jorge",
-    "figsoda",
-    "FlyingRatBull",
-    "follower",
-    "forbjok",
-    "Forest Anderson",
-    "François",
-    "Freya",
-    "Fuyang Liu",
-    "Gab Campbell",
-    "GabLotus",
-    "Garett Cooper",
-    "Georg Friedrich Schuppe",
-    "Gilbert Röhrbein",
-    "giusdp",
-    "Grant Moyer",
-    "Gray Olson",
-    "Grayson Burton",
-    "Gregor",
-    "Gregory Oakes",
-    "Grindv1k",
-    "Guillaume DALLENNE",
-    "Guim Caballero",
-    "Halfwhit",
-    "Hans W. Uhlig",
-    "Hoidigan",
-    "Hugo Lindsay",
-    "HyperLightKitsune",
-    "Iaiao",
-    "ifletsomeclaire",
-    "Ilja Kartašov",
-    "iMplode nZ",
-    "Isaak Eriksson",
-    "Ixentus",
-    "Jackson Lango",
-    "Jacob Gardner",
-    "jak6jak",
-    "Jake Kerr",
-    "Jakob Hellermann",
-    "James Higgins",
-    "James Leflang",
-    "James Liu",
-    "James R",
-    "Jasen Borisov",
-    "Jay Oster",
-    "Jeremiah Senkpiel",
-    "Jerome Humbert",
-    "jngbsn",
-    "João Capucho",
-    "Joel Nordström",
-    "Johan Klokkhammer Helsing",
-    "John",
-    "John Doneth",
-    "John Mitchell",
-    "Jonas Matser",
-    "Jonathan Behrens",
-    "Jonathan Cornaz",
-    "Josh Kuhn",
-    "Josh Taylor",
-    "Joshua Chapman",
-    "Joshua J. Bouw",
-    "Joshua Ols",
-    "julhe",
-    "Julian Heinken",
-    "Junfeng Liu",
-    "kaflu",
-    "karroffel",
-    "Kenneth Dodrill",
-    "Klim Tsoutsman",
-    "Kurt Kühnert",
-    "Lachlan Sneff",
-    "lambdagolem",
-    "lee-orr",
-    "Léo Gillot-Lamure",
-    "Loch Wansbrough",
-    "Logan Collins",
-    "Logan Magee",
-    "Lucas Kent",
-    "Lucas Rocha",
-    "Lukas Orsvärn",
-    "Lukas Wirth",
-    "M",
-    "Marcel Müller",
-    "Marc Parenteau",
-    "Marcus Buffett",
-    "Marek Fajkus",
-    "Marek Legris",
-    "marius851000",
-    "Mariusz Kryński",
-    "Mark",
-    "Martin Lavoie",
-    "Martín Maita",
-    "Martin Svanberg",
-    "Mat Hostetter",
-    "Matteo Guglielmetti",
-    "Matthias Seiffert",
-    "Max Bruckner",
-    "maxwellodri",
-    "memoryruins",
-    "mfrancis107",
-    "MGlolenstine",
-    "Michael Hills",
-    "Michael Tang",
-    "Mika",
-    "Mikail Khan",
-    "Mike",
-    "Milan Vaško",
-    "milkybit",
-    "MinerSebas",
-    "Minghao Liu",
-    "MiniaczQ",
-    "Mirko Rainer",
-    "Moxinilian",
-    "MsK`",
-    "multun",
-    "Nathan Jeffords",
-    "Nathan Stocks",
-    "Nathan Ward",
-    "Nibor62",
-    "Nicholas Rishel",
-    "Nick",
-    "Nikita Zdanovitch",
-    "Niklas Eicker",
-    "Noah Callaway",
-    "Nolan Darilek",
-    "Olivier Pinon",
-    "OptimisticPeach",
-    "Oscar",
-    "Patrick Greene",
-    "Patrik Buhring",
-    "Paweł Grabarz",
-    "Philip Degarmo",
-    "Philipp Mildenberger",
-    "Piotr Balcer",
-    "Plecra",
-    "Protowalker",
-    "Psychoticpotato",
-    "r00ster",
-    "Raymond",
-    "RedlineTriad",
-    "reidbhuntley",
-    "Rémi Lauzier",
-    "Renato Caldas",
-    "Restioson",
-    "Richard Tjerngren",
-    "RiskLove",
-    "rmsthebest",
-    "Rob",
-    "Robbie Davenport",
-    "Robert Swain",
-    "Rob Parrett",
-    "rod-salazar",
-    "Ryan Lee",
-    "Ryan Scheel",
-    "sapir",
-    "sark",
-    "Saverio Miroddi",
-    "Schell Carl Scivally",
-    "sdfgeoff",
-    "Sergey Minakov",
-    "simens_green",
-    "simlay",
-    "Simon Guillot",
-    "Smite Rust",
-    "speak",
-    "Spencer Burris",
-    "Squirrel",
-    "StarArawn",
-    "stefee",
-    "Stjepan Glavina",
-    "SvenTS",
-    "szunami",
-    "taryn",
-    "TehPers",
-    "Telzhaak",
-    "TEMHOTAOKEAHA",
-    "terrarier2111",
-    "thebluefish",
-    "Theia Vogel",
-    "the-notable",
-    "Théo Degioanni",
-    "TheRawMeatball",
-    "therealstork",
-    "Thirds",
-    "Thomas Heartman",
-    "Thomas Herzog",
-    "Tiago Ferreira",
-    "tiagolam",
-    "tigregalis",
-    "Tomasz Sterna",
-    "Tom Bebb",
-    "Toniman20",
-    "Toothbrush",
-    "TotalKrill",
-    "Tristan Pemble",
-    "Utkarsh",
-    "Valentin",
-    "verzuz",
-    "Victor \"multun\" Collod",
-    "VitalyR",
-    "Vladyslav Batyrenko",
-    "VVishion",
-    "walterpie",
-    "Waridley",
-    "W. Brian Gourlie",
-    "Will Crichton",
-    "Will Dixon",
-    "Will Hart",
-    "William Batista",
-    "willolisp",
-    "Wojciech Olejnik",
-    "Wouter Buckens",
-    "Wouter Standaert",
-    "wyhaya",
-    "Xavientois",
-    "Yoh Deadfall",
-    "Zach Gotsch",
-    "Zaszi",
-    "Zhixing Zhang",
-    "Zicklag",
-    "Zooce",
-];
+const CONTRIBUTORS_LIST: &[&str] = &["Carter Anderson", "And Many More"];
 
 fn setup_contributor_selection(
     mut commands: Commands,
     asset_server: Res<AssetServer>,
     mut materials: ResMut<Assets<ColorMaterial>>,
 ) {
+    // Load contributors from the git history log or use default values from
+    // the constant array. Contributors must be unique. That's why BTreeSet is used
     let contribs = contributors().unwrap_or_else(|_| {
         BTreeSet::from_iter(CONTRIBUTORS_LIST.iter().map(|name| name.to_string()))
     });

From 7155eaca82685f3b02c60cb03e9876a510a516ba Mon Sep 17 00:00:00 2001
From: Rostyslav Toch <RokaRostuk@gmail.com>
Date: Sun, 5 Dec 2021 23:50:26 +0200
Subject: [PATCH 6/8] Update comment in contributors example

Co-authored-by: Alice Cecile <alice.i.cecile@gmail.com>
---
 examples/2d/contributors.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 55a728c0d7289..54647ba049b6e 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -69,7 +69,7 @@ fn setup_contributor_selection(
     mut materials: ResMut<Assets<ColorMaterial>>,
 ) {
     // Load contributors from the git history log or use default values from
-    // the constant array. Contributors must be unique. That's why BTreeSet is used
+    // the constant array. Contributors must be unique, so they are stored in a BTreeSet
     let contribs = contributors().unwrap_or_else(|_| {
         BTreeSet::from_iter(CONTRIBUTORS_LIST.iter().map(|name| name.to_string()))
     });

From db3c4bf0d1c442daa9c7c37a3070d70a7bbca526 Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Mon, 6 Dec 2021 11:09:03 +0200
Subject: [PATCH 7/8] Replaced BTreeSet with HashSet

---
 examples/2d/contributors.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 54647ba049b6e..576deaff3495d 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -1,7 +1,6 @@
-use bevy::prelude::*;
+use bevy::{prelude::*, utils::HashSet};
 use rand::{prelude::SliceRandom, Rng};
 use std::{
-    collections::BTreeSet,
     env::VarError,
     io::{self, BufRead, BufReader},
     process::Stdio,
@@ -19,8 +18,8 @@ fn main() {
         .run();
 }
 
-// Store contributors in a sorted collection that preserves the uniqueness
-type Contributors = BTreeSet<String>;
+// Store contributors in a collection that preserves the uniqueness
+type Contributors = HashSet<String>;
 
 struct ContributorSelection {
     order: Vec<(String, Entity)>,
@@ -69,9 +68,12 @@ fn setup_contributor_selection(
     mut materials: ResMut<Assets<ColorMaterial>>,
 ) {
     // Load contributors from the git history log or use default values from
-    // the constant array. Contributors must be unique, so they are stored in a BTreeSet
+    // the constant array. Contributors must be unique, so they are stored in a HashSet
     let contribs = contributors().unwrap_or_else(|_| {
-        BTreeSet::from_iter(CONTRIBUTORS_LIST.iter().map(|name| name.to_string()))
+        CONTRIBUTORS_LIST
+            .iter()
+            .map(|name| name.to_string())
+            .collect()
     });
 
     let texture_handle = asset_server.load("branding/icon.png");

From 6ccbc302044e42c90bc0402c0a252b2e9e9e738d Mon Sep 17 00:00:00 2001
From: CrazyRoka <rokarostuk@gmail.com>
Date: Wed, 8 Dec 2021 14:53:27 +0200
Subject: [PATCH 8/8] Moved LoadContributorsError closer to the function

---
 examples/2d/contributors.rs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/2d/contributors.rs b/examples/2d/contributors.rs
index 576deaff3495d..1cd9a99eaeb7f 100644
--- a/examples/2d/contributors.rs
+++ b/examples/2d/contributors.rs
@@ -43,12 +43,6 @@ struct Velocity {
     rotation: f32,
 }
 
-enum LoadContributorsError {
-    IO(io::Error),
-    Var(VarError),
-    Stdout,
-}
-
 const GRAVITY: f32 = -9.821 * 100.0;
 const SPRITE_SIZE: f32 = 75.0;
 
@@ -341,6 +335,12 @@ fn move_system(time: Res<Time>, mut query: Query<(&Velocity, &mut Transform)>) {
     }
 }
 
+enum LoadContributorsError {
+    IO(io::Error),
+    Var(VarError),
+    Stdout,
+}
+
 /// Get the names of all contributors from the git log.
 ///
 /// The names are deduplicated.