lostecho/ncspot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix deprecation warnings caused by old trait object syntax

Browse Source
This commit is contained in:
Henrik Friedrichsen
2019-09-01 01:32:50 +02:00
parent 9a38eaa535
commit 7aa70fcb6b
10 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/spotify.rs
View File

@@ -75,9 +75,9 @@ struct Worker {
commands: mpsc::UnboundedReceiver<WorkerCommand>,
session: Session,
player: Player,
play_task: Box<futures::Future<Item = (), Error = oneshot::Canceled>>,
refresh_task: Box<futures::Stream<Item = (), Error = tokio_timer::Error>>,
token_task: Box<futures::Future<Item = (), Error = MercuryError>>,
play_task: Box<dyn futures::Future<Item = (), Error = oneshot::Canceled>>,
refresh_task: Box<dyn futures::Stream<Item = (), Error = tokio_timer::Error>>,
token_task: Box<dyn futures::Future<Item = (), Error = MercuryError>>,
active: bool,
}
@@ -102,7 +102,7 @@ impl Worker {
}
impl Worker {
fn create_refresh(&self) -> Box<futures::Stream<Item = (), Error = tokio_timer::Error>> {
fn create_refresh(&self) -> Box<dyn futures::Stream<Item = (), Error = tokio_timer::Error>> {
let ev = self.events.clone();
let future =
tokio_timer::Interval::new_interval(Duration::from_millis(400)).map(move |_| {
@@ -185,8 +185,8 @@ impl futures::Future for Worker {
}
Err(e) => {
error!("could not generate token: {:?}", e);
},
_ => ()
}
_ => (),
}
if !progress {
@@ -256,7 +256,7 @@ impl Spotify {
fn get_token(
session: &Session,
sender: oneshot::Sender<Token>,
) -> Box<Future<Item = (), Error = MercuryError>> {
) -> Box<dyn Future<Item = (), Error = MercuryError>> {
let client_id = config::CLIENT_ID;
let scopes = "user-read-private,playlist-read-private,playlist-read-collaborative,playlist-modify-public,playlist-modify-private,user-follow-modify,user-follow-read,user-library-read,user-library-modify,user-top-read,user-read-recently-played";
let url = format!(