Merge pull request #4 from nerdatmath/push-snuwwttvsqwm

Fix `mismatched_lifetime_syntaxes`.

Author: nerdatmath

2023/01/src/part1/mod.rs

@@ -3,7 +3,7 @@ use crate::puzzle::Puzzle;
 #[derive(Debug)]
 struct NoDigitError<'a>(#[allow(dead_code)]&'a str);
 
-fn first_digit(s: &str) -> Result<u64, NoDigitError> {
+fn first_digit(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     for ch in s.chars() {
         match ch {
             '0'..='9' => return Ok(u64::from(ch) - u64::from('0')),
@@ -13,7 +13,7 @@ fn first_digit(s: &str) -> Result<u64, NoDigitError> {
     Err(NoDigitError(s))
 }
 
-fn last_digit(s: &str) -> Result<u64, NoDigitError> {
+fn last_digit(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     for ch in s.chars().rev() {
         match ch {
             '0'..='9' => return Ok(u64::from(ch) - u64::from('0')),
@@ -23,7 +23,7 @@ fn last_digit(s: &str) -> Result<u64, NoDigitError> {
     Err(NoDigitError(s))
 }
 
-fn calibration_value(s: &str) -> Result<u64, NoDigitError> {
+fn calibration_value(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     Ok(first_digit(s)? * 10 + last_digit(s)?)
 }
 

2023/01/src/part2/mod.rs

@@ -7,7 +7,7 @@ struct NoDigitError<'a>(#[allow(dead_code)] &'a str);
 
 const DIGITS: &str = r"([0-9]|one|two|three|four|five|six|seven|eight|nine)";
 
-fn from_digit(s: &str) -> Result<u64, NoDigitError> {
+fn from_digit(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     Ok(match s {
         "0" => 0,
         "1" | "one" => 1,
@@ -23,23 +23,23 @@ fn from_digit(s: &str) -> Result<u64, NoDigitError> {
     })
 }
 
-fn first_digit(s: &str) -> Result<u64, NoDigitError> {
+fn first_digit(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     static RE: LazyLock<Regex> =
         LazyLock::new(|| Regex::new(&[r"^.*?", DIGITS, r".*$"].join("")).unwrap());
     let captures = RE.captures(s).ok_or(NoDigitError(s))?;
     let m = captures.get(1).unwrap();
     from_digit(m.as_str())
 }
 
-fn last_digit(s: &str) -> Result<u64, NoDigitError> {
+fn last_digit(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     static RE: LazyLock<Regex> =
         LazyLock::new(|| Regex::new(&[r"^.*", DIGITS, r".*?$"].join("")).unwrap());
     let captures = RE.captures(s).ok_or(NoDigitError(s))?;
     let m = captures.get(1).unwrap();
     from_digit(m.as_str())
 }
 
-fn calibration_value(s: &str) -> Result<u64, NoDigitError> {
+fn calibration_value(s: &'_ str) -> Result<u64, NoDigitError<'_>> {
     Ok(first_digit(s)? * 10 + last_digit(s)?)
 }
 

bag/src/lib.rs

@@ -28,7 +28,7 @@ impl<T: Eq + Hash> Bag<T> {
         self.0.values().sum()
     }
 
-    pub fn iter(&self) -> Iter<T> {
+    pub fn iter(&'_ self) -> Iter<'_, T> {
         self.0.iter()
     }
 }