Skip to content

Commit 27a8e56

Browse files
committed
More linting fixes
1 parent 587e8ca commit 27a8e56

File tree

6 files changed

+12
-13
lines changed

6 files changed

+12
-13
lines changed

psst-gui/src/data/config.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,19 +298,15 @@ impl Default for SortOrder {
298298
}
299299
}
300300

301-
#[derive(Copy, Clone, Debug, Eq, PartialEq, Data, Serialize, Deserialize)]
301+
#[derive(Copy, Clone, Debug, Eq, PartialEq, Data, Serialize, Deserialize, Default)]
302302
pub enum SortCriteria {
303303
Title,
304304
Artist,
305305
Album,
306306
Duration,
307+
#[default]
307308
DateAdded,
308309
}
309-
impl Default for SortCriteria {
310-
fn default() -> Self {
311-
Self::DateAdded
312-
}
313-
}
314310

315311
fn get_dir_size(path: &Path) -> Option<u64> {
316312
fs::read_dir(path).ok()?.try_fold(0, |acc, entry| {

psst-gui/src/data/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ impl AppState {
224224
.find(|queued| queued.item.id() == item_id)
225225
.cloned()
226226
{
227-
return Some(queued);
227+
Some(queued)
228228
} else {
229229
None
230230
}

psst-gui/src/data/promise.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ use druid::Data;
22

33
use crate::error::Error;
44

5-
#[derive(Clone, Debug, Data)]
5+
#[derive(Clone, Debug, Data, Default)]
66
pub enum Promise<T: Data, D: Data = (), E: Data = Error> {
7+
#[default]
78
Empty,
89
Deferred { def: D },
910
Resolved { def: D, val: T },
@@ -112,8 +113,4 @@ impl<D: Data + Default, T: Data, E: Data> Promise<T, D, E> {
112113
}
113114
}
114115

115-
impl<T: Data, D: Data, E: Data> Default for Promise<T, D, E> {
116-
fn default() -> Self {
117-
Self::Empty
118-
}
119-
}
116+

psst-gui/src/data/track.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,13 @@ impl From<TrackId> for String {
111111
}
112112

113113
#[derive(Clone, Data, Debug, Deserialize)]
114+
#[allow(dead_code)]
114115
pub struct AudioAnalysis {
115116
pub segments: Vector<AudioSegment>,
116117
}
117118

118119
#[derive(Clone, Data, Debug, Deserialize)]
120+
#[allow(dead_code)]
119121
pub struct AudioSegment {
120122
#[serde(flatten)]
121123
pub interval: TimeInterval,
@@ -125,6 +127,7 @@ pub struct AudioSegment {
125127
}
126128

127129
#[derive(Clone, Data, Debug, Deserialize)]
130+
#[allow(dead_code)]
128131
pub struct TimeInterval {
129132
#[serde(deserialize_with = "super::utils::deserialize_secs")]
130133
pub start: Duration,

psst-gui/src/data/utils.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ impl From<Float64> for f64 {
113113
}
114114
}
115115

116+
#[allow(dead_code)]
116117
pub fn deserialize_secs<'de, D>(deserializer: D) -> Result<Duration, D::Error>
117118
where
118119
D: Deserializer<'de>,

psst-gui/src/webapi/client.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -415,6 +415,7 @@ impl WebApi {
415415
}
416416

417417
#[derive(Deserialize)]
418+
#[allow(dead_code)]
418419
pub enum MediaType {
419420
#[serde(rename = "AUDIO")]
420421
Audio,
@@ -691,6 +692,7 @@ impl WebApi {
691692

692693
pub fn get_user_top_artist(&self) -> Result<Vector<Artist>, Error> {
693694
#[derive(Clone, Data, Deserialize)]
695+
#[allow(dead_code)]
694696
struct Artists {
695697
artists: Artist,
696698
}

0 commit comments

Comments
 (0)