cargo update + format + clippy

This commit is contained in:
Henrik Friedrichsen
2020-11-21 15:42:17 +01:00
parent d728cd2bb4
commit 09febf7187
5 changed files with 260 additions and 168 deletions

View File

@@ -309,7 +309,7 @@ fn main() {
let mut main = s.find_name::<ui::layout::Layout>("main").unwrap();
main.clear_cmdline();
}
if cmd.starts_with('/') {
if cmd.strip_prefix('/').is_some() {
let query = &cmd[1..];
let command = Command::Jump(JumpMode::Query(query.to_string()));
if let Some(data) = s.user_data::<UserData>().cloned() {

View File

@@ -47,7 +47,7 @@ fn get_metadata(playable: Option<Playable>) -> Metadata {
"/org/ncspot/{}",
playable
.map(|t| t.uri().replace(':', "/"))
.unwrap_or("0".to_string())
.unwrap_or_else(|| String::from("0"))
)))),
);
hm.insert(
@@ -268,7 +268,7 @@ fn run_dbus_server(
Ok(())
})
};
let property_volume = {
let spotify1 = spotify.clone();
let spotify2 = spotify.clone();
@@ -366,7 +366,6 @@ fn run_dbus_server(
let property_shuffle = {
let queue_get = queue.clone();
let queue_set = queue.clone();
let event = ev.clone();
f.property::<bool, _>("Shuffle", ())
.access(Access::ReadWrite)
.on_get(move |iter, _| {
@@ -378,7 +377,7 @@ fn run_dbus_server(
if let Some(shuffle_state) = iter.get() {
queue_set.set_shuffle(shuffle_state);
}
event.trigger();
ev.trigger();
Ok(())
})
};

View File

@@ -67,10 +67,8 @@ impl ContextMenu {
let modal = Modal::new(already_added_dialog);
s.add_layer(modal);
return;
} else {
playlist.append_tracks(&[track.clone()], spotify, library);
playlist.append_tracks(&[track], spotify, library);
s.pop_layer();
}
});

View File

@@ -579,7 +579,8 @@ impl<I: ListItem + Clone> ViewExt for ListView<I> {
let spotify = self.queue.get_spotify();
let re =
Regex::new(r"https?://open\.spotify\.com/(user/[^/]+/)?(\S+)/(\S+)(\?si=\S+)?").unwrap();
Regex::new(r"https?://open\.spotify\.com/(user/[^/]+/)?(\S+)/(\S+)(\?si=\S+)?")
.unwrap();
let captures = re.captures(&url);
if let Some(captures) = captures {