Skip to content

chore: use derive_more::IntoIterator #6480

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
LesnyRumcajs merged 2 commits into from
Jan 26, 2026
Merged

chore: use derive_more::IntoIterator #6480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b921609
chore: use `derive_more::IntoIterator`
LesnyRumcajs Jan 26, 2026
8773c2c
iter not needed at all
LesnyRumcajs Jan 26, 2026
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
36 changes: 14 additions & 22 deletions src/blocks/tipset.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,21 @@ use thiserror::Error;
/// Equal keys will have equivalent iteration order, but note that the `CIDs`
/// are *not* maintained in the same order as the canonical iteration order of
/// blocks in a tipset (which is by ticket)
#[derive(Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize, PartialOrd, Ord, GetSize)]
#[derive(
Clone,
Debug,
PartialEq,
Eq,
Hash,
Serialize,
Deserialize,
PartialOrd,
Ord,
GetSize,
derive_more::IntoIterator,
)]
#[cfg_attr(test, derive(derive_quickcheck_arbitrary::Arbitrary))]
pub struct TipsetKey(SmallCidNonEmptyVec);
pub struct TipsetKey(#[into_iterator(owned, ref)] SmallCidNonEmptyVec);

impl TipsetKey {
// Special encoding to match Lotus.
Expand Down Expand Up @@ -121,26 +133,6 @@ impl fmt::Display for TipsetKey {
}
}

impl<'a> IntoIterator for &'a TipsetKey {
type Item = <&'a SmallCidNonEmptyVec as IntoIterator>::Item;

type IntoIter = <&'a SmallCidNonEmptyVec as IntoIterator>::IntoIter;

fn into_iter(self) -> Self::IntoIter {
(&self.0).into_iter()
}
}

impl IntoIterator for TipsetKey {
type Item = <SmallCidNonEmptyVec as IntoIterator>::Item;

type IntoIter = <SmallCidNonEmptyVec as IntoIterator>::IntoIter;

fn into_iter(self) -> Self::IntoIter {
self.0.into_iter()
}
}

#[cfg(test)]
impl Default for TipsetKey {
fn default() -> Self {
Expand Down
28 changes: 0 additions & 28 deletions src/cid_collections/hash_set.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,31 +73,3 @@ impl FromIterator<Cid> for CidHashSet {
this
}
}

pub struct IntoIter {
inner: hash_map::IntoIter<()>,
}

impl Iterator for IntoIter {
type Item = Cid;

fn next(&mut self) -> Option<Self::Item> {
self.inner.next().map(|(it, ())| it)
}

fn size_hint(&self) -> (usize, Option<usize>) {
self.inner.size_hint()
}
}

impl IntoIterator for CidHashSet {
type Item = Cid;

type IntoIter = IntoIter;

fn into_iter(self) -> Self::IntoIter {
IntoIter {
inner: self.inner.into_iter(),
}
}
}
Loading