Skip to content

Commit 18f070c

Browse files
committed
background_jobs: Sort variants alphabetically
1 parent aeda6d6 commit 18f070c

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/background_jobs.rs

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ use crate::worker::cloudfront::CloudFront;
1313
use cargo_registry_index::Repository;
1414

1515
pub enum Job {
16+
AddCrate(AddCrateJob),
1617
DailyDbMaintenance,
1718
DumpDb(DumpDbJob),
18-
AddCrate(AddCrateJob),
19+
NormalizeIndex(NormalizeIndexJob),
20+
RenderAndUploadReadme(RenderAndUploadReadmeJob),
1921
SquashIndex,
20-
UpdateCrateIndex(UpdateCrateIndexJob),
2122
SyncToGitIndex(SyncToIndexJob),
2223
SyncToSparseIndex(SyncToIndexJob),
2324
SyncYanked(SyncYankedJob),
24-
NormalizeIndex(NormalizeIndexJob),
25-
RenderAndUploadReadme(RenderAndUploadReadmeJob),
25+
UpdateCrateIndex(UpdateCrateIndexJob),
2626
UpdateDownloads,
2727
}
2828

@@ -41,16 +41,16 @@ pub(crate) struct PerformState<'a> {
4141
}
4242

4343
impl Job {
44+
const ADD_CRATE: &str = "add_crate";
4445
const DAILY_DB_MAINTENANCE: &str = "daily_db_maintenance";
4546
const DUMP_DB: &str = "dump_db";
46-
const ADD_CRATE: &str = "add_crate";
47-
const SQUASH_INDEX: &str = "squash_index";
48-
const UPDATE_CRATE_INDEX: &str = "update_crate_index";
49-
const SYNC_YANKED: &str = "sync_yanked";
5047
const NORMALIZE_INDEX: &str = "normalize_index";
5148
const RENDER_AND_UPLOAD_README: &str = "render_and_upload_readme";
49+
const SQUASH_INDEX: &str = "squash_index";
5250
const SYNC_TO_GIT_INDEX: &str = "sync_to_git_index";
5351
const SYNC_TO_SPARSE_INDEX: &str = "sync_to_sparse_index";
52+
const SYNC_YANKED: &str = "sync_yanked";
53+
const UPDATE_CRATE_INDEX: &str = "update_crate_index";
5454
const UPDATE_DOWNLOADS: &str = "update_downloads";
5555

5656
pub fn enqueue_sync_to_index<T: ToString>(
@@ -143,32 +143,32 @@ impl Job {
143143

144144
fn as_type_str(&self) -> &'static str {
145145
match self {
146+
Job::AddCrate(_) => Self::ADD_CRATE,
146147
Job::DailyDbMaintenance => Self::DAILY_DB_MAINTENANCE,
147148
Job::DumpDb(_) => Self::DUMP_DB,
148-
Job::AddCrate(_) => Self::ADD_CRATE,
149-
Job::SquashIndex => Self::SQUASH_INDEX,
150-
Job::UpdateCrateIndex(_) => Self::UPDATE_CRATE_INDEX,
151-
Job::SyncYanked(_) => Self::SYNC_YANKED,
152149
Job::NormalizeIndex(_) => Self::NORMALIZE_INDEX,
153150
Job::RenderAndUploadReadme(_) => Self::RENDER_AND_UPLOAD_README,
151+
Job::SquashIndex => Self::SQUASH_INDEX,
154152
Job::SyncToGitIndex(_) => Self::SYNC_TO_GIT_INDEX,
155153
Job::SyncToSparseIndex(_) => Self::SYNC_TO_SPARSE_INDEX,
154+
Job::SyncYanked(_) => Self::SYNC_YANKED,
155+
Job::UpdateCrateIndex(_) => Self::UPDATE_CRATE_INDEX,
156156
Job::UpdateDownloads => Self::UPDATE_DOWNLOADS,
157157
}
158158
}
159159

160160
fn to_value(&self) -> serde_json::Result<serde_json::Value> {
161161
match self {
162+
Job::AddCrate(inner) => serde_json::to_value(inner),
162163
Job::DailyDbMaintenance => Ok(serde_json::Value::Null),
163164
Job::DumpDb(inner) => serde_json::to_value(inner),
164-
Job::AddCrate(inner) => serde_json::to_value(inner),
165-
Job::SquashIndex => Ok(serde_json::Value::Null),
166-
Job::UpdateCrateIndex(inner) => serde_json::to_value(inner),
167-
Job::SyncYanked(inner) => serde_json::to_value(inner),
168165
Job::NormalizeIndex(inner) => serde_json::to_value(inner),
169166
Job::RenderAndUploadReadme(inner) => serde_json::to_value(inner),
167+
Job::SquashIndex => Ok(serde_json::Value::Null),
170168
Job::SyncToGitIndex(inner) => serde_json::to_value(inner),
171169
Job::SyncToSparseIndex(inner) => serde_json::to_value(inner),
170+
Job::SyncYanked(inner) => serde_json::to_value(inner),
171+
Job::UpdateCrateIndex(inner) => serde_json::to_value(inner),
172172
Job::UpdateDownloads => Ok(serde_json::Value::Null),
173173
}
174174
}
@@ -189,16 +189,16 @@ impl Job {
189189
) -> Result<Self, PerformError> {
190190
use serde_json::from_value;
191191
Ok(match job_type {
192+
Self::ADD_CRATE => Job::AddCrate(from_value(value)?),
192193
Self::DAILY_DB_MAINTENANCE => Job::DailyDbMaintenance,
193194
Self::DUMP_DB => Job::DumpDb(from_value(value)?),
194-
Self::ADD_CRATE => Job::AddCrate(from_value(value)?),
195-
Self::SQUASH_INDEX => Job::SquashIndex,
196-
Self::UPDATE_CRATE_INDEX => Job::UpdateCrateIndex(from_value(value)?),
197-
Self::SYNC_YANKED => Job::SyncYanked(from_value(value)?),
198195
Self::NORMALIZE_INDEX => Job::NormalizeIndex(from_value(value)?),
199196
Self::RENDER_AND_UPLOAD_README => Job::RenderAndUploadReadme(from_value(value)?),
197+
Self::SQUASH_INDEX => Job::SquashIndex,
200198
Self::SYNC_TO_GIT_INDEX => Job::SyncToGitIndex(from_value(value)?),
201199
Self::SYNC_TO_SPARSE_INDEX => Job::SyncToSparseIndex(from_value(value)?),
200+
Self::SYNC_YANKED => Job::SyncYanked(from_value(value)?),
201+
Self::UPDATE_CRATE_INDEX => Job::UpdateCrateIndex(from_value(value)?),
202202
Self::UPDATE_DOWNLOADS => Job::UpdateDownloads,
203203
job_type => Err(PerformError::from(format!("Unknown job type {job_type}")))?,
204204
})

0 commit comments

Comments
 (0)