Fixed nightly conflict with

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,

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;
 

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;

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;

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<Sha1>;
 

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;
 

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;

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;

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();

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;
 

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;

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};