clippy
This commit is contained in:
@@ -64,9 +64,9 @@ impl fmt::Display for UriPath {
|
||||
}
|
||||
}
|
||||
|
||||
impl<'a> Into<&'a str> for &'a UriPath {
|
||||
fn into(self) -> &'a str {
|
||||
self.0.as_str()
|
||||
impl<'a> From<&'a UriPath> for &'a str {
|
||||
fn from(val: &'a UriPath) -> Self {
|
||||
val.0.as_str()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ impl Inventory {
|
||||
.collect::<Result<Vec<Category>, Error>>()?;
|
||||
|
||||
for category in &mut categories {
|
||||
category.populate_items(&ctx, &pool).await?;
|
||||
category.populate_items(ctx, pool).await?;
|
||||
}
|
||||
|
||||
Ok(Self { categories })
|
||||
|
||||
@@ -450,12 +450,10 @@ pub async fn trip_edit_attribute(
|
||||
Form(trip_update): Form<TripUpdate>,
|
||||
) -> Result<Redirect, Error> {
|
||||
let ctx = Context::build(current_user);
|
||||
if attribute == models::trips::TripAttribute::Name {
|
||||
if trip_update.new_value.is_empty() {
|
||||
return Err(Error::Request(RequestError::EmptyFormElement {
|
||||
name: "name".to_string(),
|
||||
}));
|
||||
}
|
||||
if attribute == models::trips::TripAttribute::Name && trip_update.new_value.is_empty() {
|
||||
return Err(Error::Request(RequestError::EmptyFormElement {
|
||||
name: "name".to_string(),
|
||||
}));
|
||||
}
|
||||
models::trips::Trip::set_attribute(
|
||||
&ctx,
|
||||
@@ -477,7 +475,7 @@ pub async fn trip_item_set_state(
|
||||
key: models::trips::TripItemStateKey,
|
||||
value: bool,
|
||||
) -> Result<(), Error> {
|
||||
models::trips::TripItem::set_state(&ctx, &state.database_pool, trip_id, item_id, key, value)
|
||||
models::trips::TripItem::set_state(ctx, &state.database_pool, trip_id, item_id, key, value)
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
@@ -500,7 +498,7 @@ pub async fn trip_row(
|
||||
trip_id,
|
||||
&item,
|
||||
models::inventory::InventoryItem::get_category_max_weight(
|
||||
&ctx,
|
||||
ctx,
|
||||
&state.database_pool,
|
||||
item.item.category_id,
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user