Skip to content

Commit

Permalink
fix non-nightly build
Browse files Browse the repository at this point in the history
Closes #53
  • Loading branch information
geogriff-signal authored and mcginty committed Apr 5, 2019
1 parent 9ccbc5a commit e5818f9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/handshakestate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use crate::utils::Toggle;
use crate::types::{Dh, Hash, Random};
use crate::cipherstate::{CipherState, CipherStates};
#[cfg(feature = "nightly")] use std::convert::TryFrom;
#[cfg(not(feature = "nightly"))] use utils::TryFrom;
#[cfg(not(feature = "nightly"))] use crate::utils::TryFrom;
use crate::symmetricstate::SymmetricState;
use crate::params::{HandshakeTokens, MessagePatterns, NoiseParams, Token};
use crate::error::{Error, InitStage, StateProblem};
Expand Down
2 changes: 1 addition & 1 deletion src/params/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::convert::TryFrom;

#[allow(unused_imports)]
#[cfg(not(feature = "nightly"))]
use utils::TryFrom;
use crate::utils::TryFrom;

use crate::error::{Error, PatternProblem};
use std::str::FromStr;
Expand Down
2 changes: 1 addition & 1 deletion src/params/patterns.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#[cfg(feature = "nightly")] use std::convert::{TryFrom};
#[cfg(not(feature = "nightly"))] use utils::{TryFrom};
#[cfg(not(feature = "nightly"))] use crate::utils::{TryFrom};
use crate::error::{Error, PatternProblem};
use std::str::FromStr;
use smallvec::SmallVec;
Expand Down
3 changes: 2 additions & 1 deletion src/session.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
use crate::error::{Error, StateProblem};
use crate::handshakestate::HandshakeState;
#[cfg(feature = "nightly")] use std::convert::{TryFrom, TryInto};
#[cfg(not(feature = "nightly"))] use utils::{TryFrom, TryInto};
#[allow(unused_imports)]
#[cfg(not(feature = "nightly"))] use crate::utils::{TryFrom, TryInto};
use crate::transportstate::TransportState;
use crate::stateless_transportstate::StatelessTransportState;

Expand Down

0 comments on commit e5818f9

Please sign in to comment.