Skip to content

controllers/krate/publish: Simplify "duplicate version" error code #9774

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
merged 2 commits into from
Oct 28, 2024
Merged

controllers/krate/publish: Simplify "duplicate version" error code #9774

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9ffb2
controllers/krate/publish: Simplify `match` statement via `map_err()`
Turbo87 Oct 28, 2024
7f0b098
controllers/krate/publish: Extract `duplicate_version_error()` fn
Turbo87 Oct 28, 2024
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
22 changes: 12 additions & 10 deletions src/controllers/krate/publish.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,16 +373,14 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
.bin_names(bin_names.as_slice())
.build();

let version = match new_version.save(conn, &verified_email_address) {
Err(diesel::result::Error::DatabaseError(diesel::result::DatabaseErrorKind::UniqueViolation, _)) => {
return Err(bad_request(format_args!(
"crate version `{}` is already uploaded",
new_version.num_no_build
)));
},
Err(error) => return Err(error.into()),
Ok(version) => version,
};
let version = new_version.save(conn, &verified_email_address).map_err(|error| {
use diesel::result::{Error, DatabaseErrorKind};
match error {
Error::DatabaseError(DatabaseErrorKind::UniqueViolation, _) =>
duplicate_version_error(new_version.num_no_build),
error => error.into(),
}
})?;

insert_version_owner_action(
conn,
Expand Down Expand Up @@ -620,6 +618,10 @@ fn missing_metadata_error_message(missing: &[&str]) -> String {
)
}

fn duplicate_version_error(version: &str) -> BoxedAppError {
bad_request(format!("crate version `{version}` is already uploaded"))
}

fn validate_rust_version(value: &str) -> AppResult<()> {
match semver::VersionReq::parse(value) {
// Exclude semver operators like `^` and pre-release identifiers
Expand Down