Skip to content

Commit ba02d0e

Browse files
authored
Merge pull request #7232 from Turbo87/dsl-star-imports
publish: Remove `dsl::*` import
2 parents 7e95789 + 8dd8b1b commit ba02d0e

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

src/controllers/krate/publish.rs

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -433,9 +433,8 @@ fn missing_metadata_error_message(missing: &[&str]) -> String {
433433
pub fn add_dependencies(
434434
conn: &mut PgConnection,
435435
deps: &[EncodableCrateDependency],
436-
target_version_id: i32,
436+
version_id: i32,
437437
) -> AppResult<()> {
438-
use self::dependencies::dsl::*;
439438
use diesel::insert_into;
440439

441440
let crate_ids = crates::table
@@ -454,7 +453,7 @@ pub fn add_dependencies(
454453
}
455454

456455
// Match only identical names to ensure the index always references the original crate name
457-
let Some(&krate_id) = crate_ids.get(&dep.name.0) else {
456+
let Some(&crate_id) = crate_ids.get(&dep.name.0) else {
458457
return Err(cargo_err(&format_args!("no known crate named `{}`", &*dep.name)));
459458
};
460459

@@ -468,20 +467,20 @@ pub fn add_dependencies(
468467
}
469468

470469
Ok((
471-
version_id.eq(target_version_id),
472-
crate_id.eq(krate_id),
473-
req.eq(dep.version_req.to_string()),
474-
dep.kind.map(|k| kind.eq(k)),
475-
optional.eq(dep.optional),
476-
default_features.eq(dep.default_features),
477-
features.eq(&dep.features),
478-
target.eq(dep.target.as_deref()),
479-
explicit_name.eq(dep.explicit_name_in_toml.as_deref())
470+
dependencies::version_id.eq(version_id),
471+
dependencies::crate_id.eq(crate_id),
472+
dependencies::req.eq(dep.version_req.to_string()),
473+
dep.kind.map(|k| dependencies::kind.eq(k)),
474+
dependencies::optional.eq(dep.optional),
475+
dependencies::default_features.eq(dep.default_features),
476+
dependencies::features.eq(&dep.features),
477+
dependencies::target.eq(dep.target.as_deref()),
478+
dependencies::explicit_name.eq(dep.explicit_name_in_toml.as_deref())
480479
))
481480
})
482481
.collect::<Result<Vec<_>, _>>()?;
483482

484-
insert_into(dependencies)
483+
insert_into(dependencies::table)
485484
.values(&new_dependencies)
486485
.execute(conn)?;
487486

0 commit comments

Comments
 (0)