From aafd83a1cb15db1f30b23eacd80e92c5d2a8195d Mon Sep 17 00:00:00 2001
From: Anna <git@anna.lgbt>
Date: Sat, 31 Mar 2018 17:02:41 -0400
Subject: [PATCH] feat: allow non-combat jobs to be taken from their short
 codes

---
 src/jobs/non_combat.rs | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/jobs/non_combat.rs b/src/jobs/non_combat.rs
index f5313b2..f85c668 100644
--- a/src/jobs/non_combat.rs
+++ b/src/jobs/non_combat.rs
@@ -84,18 +84,18 @@ impl FromStr for NonCombatJob {
 
   fn from_str(s: &str) -> Result<Self, Self::Err> {
     let job = match s.to_lowercase().as_str() {
-      "botanist" => NonCombatJob::Botanist,
-      "fisher" => NonCombatJob::Fisher,
-      "miner" => NonCombatJob::Miner,
+      "botanist" | "btn" => NonCombatJob::Botanist,
+      "fisher" | "fsh" => NonCombatJob::Fisher,
+      "miner" | "min" => NonCombatJob::Miner,
 
-      "alchemist" => NonCombatJob::Alchemist,
-      "armorer" => NonCombatJob::Armorer,
-      "blacksmith" => NonCombatJob::Blacksmith,
-      "carpenter" => NonCombatJob::Carpenter,
-      "culinarian" => NonCombatJob::Culinarian,
-      "goldsmith" => NonCombatJob::Goldsmith,
-      "leatherworker" => NonCombatJob::Leatherworker,
-      "weaver" => NonCombatJob::Weaver,
+      "alchemist" | "alc" => NonCombatJob::Alchemist,
+      "armorer" | "arm" => NonCombatJob::Armorer,
+      "blacksmith" | "bsm" => NonCombatJob::Blacksmith,
+      "carpenter" | "crp" => NonCombatJob::Carpenter,
+      "culinarian" | "cul" => NonCombatJob::Culinarian,
+      "goldsmith" | "gsm" => NonCombatJob::Goldsmith,
+      "leatherworker" | "ltw" => NonCombatJob::Leatherworker,
+      "weaver" | "wvr" => NonCombatJob::Weaver,
       _ => return Err(UnknownVariant("NonCombatJob", s.into()))
     };