Skip to content

Commit 8b025f5

Browse files
committed
controllers/krate/versions: use named fields seek
1 parent 6edda86 commit 8b025f5

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

src/controllers/krate/versions.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ fn list_by_date(
9292
!matches!(&options.page, Page::Numeric(_)),
9393
"?page= is not supported"
9494
);
95-
if let Some(SeekPayload::Date(Date(created_at, id))) = Seek::Date.after(&options.page)? {
95+
if let Some(SeekPayload::Date(Date { created_at, id })) = Seek::Date.after(&options.page)? {
9696
query = query.filter(
9797
versions::created_at
9898
.eq(created_at)
@@ -169,7 +169,7 @@ fn list_by_semver(
169169
"?page= is not supported"
170170
);
171171
let mut idx = Some(0);
172-
if let Some(SeekPayload::Semver(Semver(id))) = Seek::Semver.after(&options.page)? {
172+
if let Some(SeekPayload::Semver(Semver { id })) = Seek::Semver.after(&options.page)? {
173173
idx = sorted_versions
174174
.get_index_of(&id)
175175
.filter(|i| i + 1 < sorted_versions.len())
@@ -236,16 +236,17 @@ mod seek {
236236
// doesn't include field names.
237237
seek! {
238238
pub enum Seek {
239-
Semver(i32)
240-
Date(#[serde(with="ts_microseconds")] chrono::NaiveDateTime, i32)
239+
Semver{id: i32}
240+
Date{#[serde(with="ts_microseconds")] created_at: chrono::NaiveDateTime, id: i32}
241241
}
242242
}
243243

244244
impl Seek {
245245
pub(crate) fn to_payload(&self, record: &(Version, Option<User>)) -> SeekPayload {
246+
let (Version { id, created_at, .. }, _) = *record;
246247
match *self {
247-
Seek::Semver => SeekPayload::Semver(Semver(record.0.id)),
248-
Seek::Date => SeekPayload::Date(Date(record.0.created_at, record.0.id)),
248+
Seek::Semver => SeekPayload::Semver(Semver { id }),
249+
Seek::Date => SeekPayload::Date(Date { created_at, id }),
249250
}
250251
}
251252
}

0 commit comments

Comments
 (0)