Skip to content

chore(clippy): use new collapsible 'if let' #8

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

Draft
wants to merge 2 commits into
base: msrv
Choose a base branch
from
Draft

chore(clippy): use new collapsible 'if let' #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd632ae
chore(clippy): use new collapsible 'if let'
billf Jul 11, 2025
c63c36a
chore(clippy): must_use attribute
billf Jul 14, 2025
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
19 changes: 13 additions & 6 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ pub struct VersionMap<T> {

impl<T> VersionMap<T> {
/// Creates a new empty `VersionMap`.
#[must_use]
pub fn new() -> Self {
Self {
versions: BTreeMap::new(),
Expand Down Expand Up @@ -135,6 +136,7 @@ impl<T> VersionMap<T> {
///
/// // Get latest major
/// assert_eq!(map.get(&Version::new(1, 0, 0)), Some(&"v1.2.1"));
#[must_use]
pub fn get(&self, version: &Version) -> Option<&T> {
if version.build.is_empty() {
let maybe_value = version_alternate(version)
Expand Down Expand Up @@ -172,6 +174,7 @@ impl<T> VersionMap<T> {
///
/// // Get latest major
/// assert_eq!(map.get_version(&Version::new(1, 0, 0)), Some((&Version::new(1, 2, 1), &"v1.2.1")));
#[must_use]
pub fn get_version(&self, version: &Version) -> Option<(&Version, &T)> {
if version.build.is_empty() {
let maybe_key_value = version_alternate(version)
Expand Down Expand Up @@ -218,6 +221,7 @@ impl<T> VersionMap<T> {
/// // Get the latest version
/// assert_eq!(map.get_or_latest(None), Some(&"v1.2.0"));
/// ```
#[must_use]
pub fn get_or_latest(&self, version: Option<&Version>) -> Option<&T> {
match version {
Some(v) => self.get(v),
Expand Down Expand Up @@ -254,6 +258,7 @@ impl<T> VersionMap<T> {
/// // Get the latest version
/// assert_eq!(map.get_or_latest_version(None), Some((&Version::new(1, 2, 0), &"v1.2.0")));
/// ```
#[must_use]
pub fn get_or_latest_version(&self, version: Option<&Version>) -> Option<(&Version, &T)> {
match version {
Some(v) => self.get_version(v),
Expand All @@ -262,22 +267,24 @@ impl<T> VersionMap<T> {
}

/// Returns the latest version and its associated value.
#[must_use]
pub fn get_latest(&self) -> Option<(&Version, &T)> {
self.versions.last_key_value().map(|(k, v)| (k.borrow(), v))
}

/// Gets a value by exact version match only, without alternate lookup.
#[must_use]
pub fn get_exact(&self, version: &Version) -> Option<&T> {
self.versions.get(version)
}

pub fn remove(&mut self, version: &Version) -> Option<T> {
if let Some(alternate) = version_alternate(version) {
if let Some(set) = self.alternates.get_mut(&alternate) {
set.remove(version);
if set.is_empty() {
self.alternates.remove(&alternate);
}
if let Some(alternate) = version_alternate(version)
&& let Some(set) = self.alternates.get_mut(&alternate)
{
set.remove(version);
if set.is_empty() {
self.alternates.remove(&alternate);
}
}

Expand Down
Loading