Chewing_Bever/otter
1
0
Fork 0
Code Issues 17 Releases 4 Packages 2 Activity

chore: listen to clippy

Browse source
This commit is contained in:
Jef Roosens 2025-03-31 20:13:18 +02:00
parent 823133c034
commit 974ca80298
No known key found for this signature in database
GPG key ID: 21FD3D77D56BAF49
7 changed files with 13 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gpodder_sqlite/src/lib.rs
View file

@ -71,11 +71,10 @@ pub struct AddQueryDebugLogs;
impl CustomizeConnection<SqliteConnection, diesel::r2d2::Error> for AddQueryDebugLogs {
fn on_acquire(&self, conn: &mut SqliteConnection) -> Result<(), diesel::r2d2::Error> {
conn.set_instrumentation(|event: InstrumentationEvent<'_>| match event {
InstrumentationEvent::StartQuery { query, .. } => {
conn.set_instrumentation(|event: InstrumentationEvent<'_>| {
if let InstrumentationEvent::StartQuery { query, .. } = event {
tracing::debug!("{}", query);
}
_ => {}
});
Ok(())

15
gpodder_sqlite/src/models/device.rs
View file

@ -58,21 +58,6 @@ impl Device {
)
.get_result(conn)
}
pub fn by_device_id(
conn: &mut SqliteConnection,
user_id: i64,
device_id: &str,
) -> diesel::QueryResult<Self> {
devices::dsl::devices
.select(Self::as_select())
.filter(
devices::user_id
.eq(user_id)
.and(devices::device_id.eq(device_id)),
)
.get_result(conn)
}
}
impl NewDevice {

4
gpodder_sqlite/src/repository/device.rs
View file

@ -1,7 +1,7 @@
use std::collections::HashSet;
use chrono::{DateTime, Utc};
use diesel::{alias, dsl::not, prelude::*, sqlite::Sqlite};
use diesel::{alias, dsl::not, prelude::*};
use gpodder::AuthErr;
use super::SqliteRepository;
@ -100,7 +100,7 @@ impl gpodder::DeviceRepository for SqliteRepository {
let device = NewDevice {
device_id: device_id.to_string(),
user_id: user.id,
caption: patch.caption.unwrap_or(String::new()),
caption: patch.caption.unwrap_or_default(),
type_: patch.r#type.unwrap_or(gpodder::DeviceType::Other).into(),
};

2
gpodder_sqlite/src/repository/subscription.rs
View file

@ -29,7 +29,7 @@ fn set_subscriptions_for_single_device(
.collect();
// URLs originally in the database that are no longer in the list
let urls_to_delete = urls_in_db.difference(&urls);
let urls_to_delete = urls_in_db.difference(urls);
// URLs not in the database that are in the new list
let urls_to_insert = urls.difference(&urls_in_db);