From c19375c5ca1a27c8a0640f1630143edcb735339c Mon Sep 17 00:00:00 2001 From: Nick Mavis Date: Mon, 16 Sep 2019 15:00:09 -0400 Subject: [PATCH] Fixed nightly conflict with --- audio/src/decrypt.rs | 2 +- audio/src/fetch.rs | 6 +++--- audio/src/lib.rs | 2 +- connect/src/context.rs | 2 +- connect/src/discovery.rs | 8 ++++---- connect/src/lib.rs | 2 +- connect/src/spirc.rs | 14 +++++++------- examples/play.rs | 8 ++++---- metadata/src/cover.rs | 6 +++--- metadata/src/lib.rs | 8 ++++---- playback/src/lib.rs | 2 +- playback/src/player.rs | 4 ++-- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/audio/src/decrypt.rs b/audio/src/decrypt.rs index b64457e7..d2697e72 100644 --- a/audio/src/decrypt.rs +++ b/audio/src/decrypt.rs @@ -6,7 +6,7 @@ use aes_ctr::stream_cipher::{ }; use aes_ctr::stream_cipher::generic_array::GenericArray; -use core::audio_key::AudioKey; +use librespot_core::audio_key::AudioKey; const AUDIO_AESIV: [u8; 16] = [ 0x72, 0xe0, 0x67, 0xfb, 0xdd, 0xcb, 0xcf, 0x77, diff --git a/audio/src/fetch.rs b/audio/src/fetch.rs index ee4a6f24..51573f6c 100644 --- a/audio/src/fetch.rs +++ b/audio/src/fetch.rs @@ -9,9 +9,9 @@ use std::io::{self, Read, Seek, SeekFrom, Write}; use std::sync::{Arc, Condvar, Mutex}; use tempfile::NamedTempFile; -use core::channel::{Channel, ChannelData, ChannelError, ChannelHeaders}; -use core::session::Session; -use core::spotify_id::FileId; +use librespot_core::channel::{Channel, ChannelData, ChannelError, ChannelHeaders}; +use librespot_core::session::Session; +use librespot_core::spotify_id::FileId; const CHUNK_SIZE: usize = 0x20000; diff --git a/audio/src/lib.rs b/audio/src/lib.rs index cd6f28e3..4cb2b937 100644 --- a/audio/src/lib.rs +++ b/audio/src/lib.rs @@ -10,7 +10,7 @@ extern crate num_traits; extern crate tempfile; extern crate aes_ctr; -extern crate librespot_core as core; +extern crate librespot_core; mod decrypt; mod fetch; diff --git a/connect/src/context.rs b/connect/src/context.rs index c102d4ba..c59e389e 100644 --- a/connect/src/context.rs +++ b/connect/src/context.rs @@ -1,4 +1,4 @@ -use core::spotify_id::SpotifyId; +use librespot_core::spotify_id::SpotifyId; use protocol::spirc::TrackRef; use serde; diff --git a/connect/src/discovery.rs b/connect/src/discovery.rs index f4875160..53d5a6ec 100644 --- a/connect/src/discovery.rs +++ b/connect/src/discovery.rs @@ -23,10 +23,10 @@ use std::sync::Arc; use tokio_core::reactor::Handle; use url; -use core::authentication::Credentials; -use core::config::ConnectConfig; -use core::diffie_hellman::{DH_GENERATOR, DH_PRIME}; -use core::util; +use librespot_core::authentication::Credentials; +use librespot_core::config::ConnectConfig; +use librespot_core::diffie_hellman::{DH_GENERATOR, DH_PRIME}; +use librespot_core::util; type HmacSha1 = Hmac; diff --git a/connect/src/lib.rs b/connect/src/lib.rs index a7911c68..cd3d5e0b 100644 --- a/connect/src/lib.rs +++ b/connect/src/lib.rs @@ -26,7 +26,7 @@ extern crate dns_sd; #[cfg(not(feature = "with-dns-sd"))] extern crate mdns; -extern crate librespot_core as core; +extern crate librespot_core; extern crate librespot_playback as playback; extern crate librespot_protocol as protocol; diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 6c6504db..37576a9e 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -10,13 +10,13 @@ use rand::seq::SliceRandom; use serde_json; use context::StationContext; -use core::config::ConnectConfig; -use core::mercury::MercuryError; -use core::session::Session; -use core::spotify_id::SpotifyId; -use core::util::SeqGenerator; -use core::version; -use core::volume::Volume; +use librespot_core::config::ConnectConfig; +use librespot_core::mercury::MercuryError; +use librespot_core::session::Session; +use librespot_core::spotify_id::SpotifyId; +use librespot_core::util::SeqGenerator; +use librespot_core::version; +use librespot_core::volume::Volume; use playback::mixer::Mixer; use playback::player::Player; use protocol; diff --git a/examples/play.rs b/examples/play.rs index 87f68825..4aa73033 100644 --- a/examples/play.rs +++ b/examples/play.rs @@ -4,10 +4,10 @@ extern crate tokio_core; use std::env; use tokio_core::reactor::Core; -use librespot::core::authentication::Credentials; -use librespot::core::config::SessionConfig; -use librespot::core::session::Session; -use librespot::core::spotify_id::SpotifyId; +use librespot::librespot_core::authentication::Credentials; +use librespot::librespot_core::config::SessionConfig; +use librespot::librespot_core::session::Session; +use librespot::librespot_core::spotify_id::SpotifyId; use librespot::playback::config::PlayerConfig; use librespot::playback::audio_backend; diff --git a/metadata/src/cover.rs b/metadata/src/cover.rs index 0ef186a0..408e658e 100644 --- a/metadata/src/cover.rs +++ b/metadata/src/cover.rs @@ -1,9 +1,9 @@ use byteorder::{BigEndian, WriteBytesExt}; use std::io::Write; -use core::channel::ChannelData; -use core::session::Session; -use core::spotify_id::FileId; +use librespot_core::channel::ChannelData; +use librespot_core::session::Session; +use librespot_core::spotify_id::FileId; pub fn get(session: &Session, file: FileId) -> ChannelData { let (channel_id, channel) = session.channel().allocate(); diff --git a/metadata/src/lib.rs b/metadata/src/lib.rs index 2d62c03c..60ca2738 100644 --- a/metadata/src/lib.rs +++ b/metadata/src/lib.rs @@ -3,7 +3,7 @@ extern crate futures; extern crate linear_map; extern crate protobuf; -extern crate librespot_core as core; +extern crate librespot_core; extern crate librespot_protocol as protocol; pub mod cover; @@ -11,9 +11,9 @@ pub mod cover; use futures::Future; use linear_map::LinearMap; -use core::mercury::MercuryError; -use core::session::Session; -use core::spotify_id::{FileId, SpotifyId}; +use librespot_core::mercury::MercuryError; +use librespot_core::session::Session; +use librespot_core::spotify_id::{FileId, SpotifyId}; pub use protocol::metadata::AudioFile_Format as FileFormat; diff --git a/playback/src/lib.rs b/playback/src/lib.rs index 557e17ff..aeb0407f 100644 --- a/playback/src/lib.rs +++ b/playback/src/lib.rs @@ -23,7 +23,7 @@ extern crate sdl2; extern crate libc; extern crate librespot_audio as audio; -extern crate librespot_core as core; +extern crate librespot_core; extern crate librespot_metadata as metadata; pub mod audio_backend; diff --git a/playback/src/player.rs b/playback/src/player.rs index a421c9ab..4be73acd 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -11,8 +11,8 @@ use std::thread; use std::time::Duration; use config::{Bitrate, PlayerConfig}; -use core::session::Session; -use core::spotify_id::SpotifyId; +use librespot_core::session::Session; +use librespot_core::spotify_id::SpotifyId; use audio::{AudioDecrypt, AudioFile}; use audio::{VorbisDecoder, VorbisPacket};