cargo: update and remove ‹thiserror›

• add ‹regex›
• add ‹lazy_static›
• remove ‹thiserror›

Signed-off-by: Matej Focko <mfocko@redhat.com>

Cargo.lock

@@ -17,14 +17,23 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "aho-corasick"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "aoc-2022"
 version = "0.1.0"
 dependencies = [
  "color-eyre",
  "itertools",
- "md-5",
+ "lazy_static",
- "thiserror",
+ "regex",
  "tracing",
  "tracing-subscriber",
 ]
@@ -44,15 +53,6 @@ dependencies = [
  "rustc-demangle",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
 [[package]]
 name = "cc"
 version = "1.0.77"
@@ -92,26 +92,6 @@ dependencies = [
  "tracing-error",
 ]
 
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
 [[package]]
 name = "either"
 version = "1.8.0"
@@ -128,16 +108,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
 [[package]]
 name = "gimli"
 version = "0.26.2"
@@ -173,9 +143,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "libc"
-version = "0.2.137"
+version = "0.2.138"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
+checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8"
 
 [[package]]
 name = "log"
@@ -195,15 +165,6 @@ dependencies = [
  "regex-automata",
 ]
 
-[[package]]
-name = "md-5"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca"
-dependencies = [
- "digest",
-]
-
 [[package]]
 name = "memchr"
 version = "2.5.0"
@@ -295,6 +256,8 @@ version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
 dependencies = [
+ "aho-corasick",
+ "memchr",
  "regex-syntax",
 ]
 
@@ -321,9 +284,9 @@ checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
 
 [[package]]
 name = "serde"
-version = "1.0.148"
+version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53f64bb4ba0191d6d0676e1b141ca55047d83b74f5607e6d8eb88126c52c2dc"
+checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055"
 
 [[package]]
 name = "sharded-slab"
@@ -351,26 +314,6 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "thiserror"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
 [[package]]
 name = "thread_local"
 version = "1.1.4"
@@ -482,12 +425,6 @@ dependencies = [
  "tracing-log",
 ]
 
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
 [[package]]
 name = "unicode-ident"
 version = "1.0.5"
@@ -500,12 +437,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"

Cargo.toml

@@ -6,12 +6,13 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-md-5 = "0.10.1"
 itertools = "0.10.2"
 tracing = "0.1.37"
 color-eyre = "0.6.2"
-thiserror = "1.0.37"
+# thiserror = "1.0.37"
 tracing-subscriber = { version = "0.3.16", default-features = true, features = ["env-filter", "local-time"] }
+regex = "1.7.0"
+lazy_static = "1.4.0"
 
 [profile.dev.package.backtrace]
 opt-level = 3

src/bin/day02.rs

@@ -2,9 +2,8 @@ use std::str::FromStr;
 
 use aoc_2022::*;
 
-use color_eyre::eyre::Result;
+use color_eyre::{eyre::{eyre, Result}, Report};
 use itertools::Itertools;
-use thiserror::Error;
 use tracing::*;
 use tracing_subscriber::EnvFilter;
 
@@ -25,28 +24,19 @@ impl Shape {
     }
 }
 
-#[derive(Error, Debug)]
-enum ShapeError {
-    #[error("empty string given")]
-    Empty,
-
-    #[error("unknown shape ‹{0}›")]
-    UnknownShape(String),
-}
-
 impl FromStr for Shape {
-    type Err = ShapeError;
+    type Err = Report;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if s.is_empty() {
-            return Err(ShapeError::Empty);
+            return Err(eyre!("empty string given"));
         }
 
         match s {
             "A" | "X" => Ok(Shape::Rock),
             "B" | "Y" => Ok(Shape::Paper),
             "C" | "Z" => Ok(Shape::Scissors),
-            _ => Err(ShapeError::UnknownShape(s.to_string())),
+            _ => Err(eyre!("unknown shape ‹{0}›", s)),
         }
     }
 }
@@ -64,14 +54,8 @@ struct Round {
     me: Shape,
 }
 
-#[derive(Error, Debug)]
-enum RoundError {
-    #[error("invalid shape ‹{0}›")]
-    InvalidShape(#[from] ShapeError),
-}
-
 impl FromStr for Round {
-    type Err = RoundError;
+    type Err = Report;
 
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let mut split_str = s.split(' ');