Skip to content

Commit c870c94

Browse files
committed
controllers/krate/publish: Extract is_reserved_name() fn
1 parent d8d5624 commit c870c94

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

src/controllers/krate/publish.rs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -339,18 +339,20 @@ fn split_body(mut bytes: Bytes) -> AppResult<(Bytes, Bytes)> {
339339
}
340340

341341
fn ensure_name_not_reserved(name: &str, conn: &mut PgConnection) -> AppResult<()> {
342-
let reserved_name: bool = select(exists(
343-
reserved_crate_names::table
344-
.filter(canon_crate_name(reserved_crate_names::name).eq(canon_crate_name(name))),
345-
))
346-
.get_result(conn)?;
347-
if reserved_name {
342+
if is_reserved_name(name, conn)? {
348343
Err(cargo_err("cannot upload a crate with a reserved name"))
349344
} else {
350345
Ok(())
351346
}
352347
}
353348

349+
fn is_reserved_name(name: &str, conn: &mut PgConnection) -> QueryResult<bool> {
350+
select(exists(reserved_crate_names::table.filter(
351+
canon_crate_name(reserved_crate_names::name).eq(canon_crate_name(name)),
352+
)))
353+
.get_result(conn)
354+
}
355+
354356
fn missing_metadata_error_message(missing: &[&str]) -> String {
355357
format!(
356358
"missing or empty metadata fields: {}. Please \

0 commit comments

Comments
 (0)