Skip to content

Commit 6f311e0

Browse files
committed
controllers/krate/publish: Inline ensure_name_not_reserved() fn
1 parent c870c94 commit 6f311e0

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

src/controllers/krate/publish.rs

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,9 @@ pub async fn publish(app: AppState, req: BytesRequest) -> AppResult<Json<GoodCra
146146
let license_file = metadata.license_file.as_deref();
147147

148148
persist.validate()?;
149-
ensure_name_not_reserved(persist.name, conn)?;
149+
if is_reserved_name(persist.name, conn)? {
150+
return Err(cargo_err("cannot upload a crate with a reserved name"));
151+
}
150152

151153
let krate = persist.create_or_update(conn, user.id)?;
152154

@@ -338,14 +340,6 @@ fn split_body(mut bytes: Bytes) -> AppResult<(Bytes, Bytes)> {
338340
Ok((json_bytes, tarball_bytes))
339341
}
340342

341-
fn ensure_name_not_reserved(name: &str, conn: &mut PgConnection) -> AppResult<()> {
342-
if is_reserved_name(name, conn)? {
343-
Err(cargo_err("cannot upload a crate with a reserved name"))
344-
} else {
345-
Ok(())
346-
}
347-
}
348-
349343
fn is_reserved_name(name: &str, conn: &mut PgConnection) -> QueryResult<bool> {
350344
select(exists(reserved_crate_names::table.filter(
351345
canon_crate_name(reserved_crate_names::name).eq(canon_crate_name(name)),

0 commit comments

Comments
 (0)