Skip to content

Commit

Permalink
Fix some nightly build errors (dani-garcia#4657)
Browse files Browse the repository at this point in the history
  • Loading branch information
dani-garcia authored and ZhReimu committed Jul 9, 2024
1 parent 025b2e6 commit 146c62b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
7 changes: 7 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ fn main() {
"You need to enable one DB backend. To build with previous defaults do: cargo build --features sqlite"
);

// Use check-cfg to let cargo know which cfg's we define,
// and avoid warnings when they are used in the code.
println!("cargo::rustc-check-cfg=cfg(sqlite)");
println!("cargo::rustc-check-cfg=cfg(mysql)");
println!("cargo::rustc-check-cfg=cfg(postgresql)");
println!("cargo::rustc-check-cfg=cfg(query_logger)");

// Rerun when these paths are changed.
// Someone could have checked-out a tag or specific commit, but no other files changed.
println!("cargo:rerun-if-changed=.git");
Expand Down
2 changes: 1 addition & 1 deletion src/db/models/attachment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl Attachment {

pub async fn delete(&self, conn: &mut DbConn) -> EmptyResult {
db_run! { conn: {
crate::util::retry(
let _: () = crate::util::retry(
|| diesel::delete(attachments::table.filter(attachments::id.eq(&self.id))).execute(conn),
10,
)
Expand Down
2 changes: 1 addition & 1 deletion src/db/models/collection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ impl CollectionUser {

db_run! { conn: {
for user in collectionusers {
diesel::delete(users_collections::table.filter(
let _: () = diesel::delete(users_collections::table.filter(
users_collections::user_uuid.eq(user_uuid)
.and(users_collections::collection_uuid.eq(user.collection_uuid))
))
Expand Down

0 comments on commit 146c62b

Please sign in to comment.