Skip to content

Fix mismatched_lifetime_syntaxes. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 10, 2025
Merged

Fix mismatched_lifetime_syntaxes. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions 2023/01/src/part1/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')),
Expand All @@ -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')),
Expand All @@ -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)?)
}

Expand Down
8 changes: 4 additions & 4 deletions 2023/01/src/part2/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)?)
}

Expand Down
2 changes: 1 addition & 1 deletion bag/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
}
Expand Down