Skip to content

refactor: 使用惯用 Rust 写法简化 Option 工具函数 #285

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
heqingpan merged 1 commit into from
Mar 1, 2026
Merged

refactor: 使用惯用 Rust 写法简化 Option 工具函数 #285

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
10 changes: 2 additions & 8 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ pub fn select_option_by_clone<T>(a: &Option<T>, b: &Option<T>) -> Option<T>
where
T: Clone,
{
match a {
Some(_a) => Some(_a.clone()),
None => b.clone(),
}
a.as_ref().cloned().or_else(|| b.clone())
}

pub fn option_owned_by_clone<T>(a: Option<&T>) -> Option<T>
Expand All @@ -33,10 +30,7 @@ where
}

pub fn merge_option<T>(a: Option<T>, b: Option<T>) -> Option<T> {
match a {
Some(v) => Some(v),
None => b,
}
a.or(b)
}

pub fn get_bool_from_string(s: &Option<String>, default: bool) -> bool {
Expand Down
Loading