f

Author: devrandom

lightning/src/lib.rs

@@ -47,7 +47,6 @@ extern crate core;
 
 #[cfg(feature = "no_std")] extern crate core2;
 
-
 #[macro_use]
 pub mod util;
 pub mod chain;
@@ -126,6 +125,8 @@ mod io_extras {
 		d.read_to_end(&mut buf)?;
 		Ok(buf)
 	}
+
+	pub use std::io::{copy, sink};
 }
 
 mod prelude {
@@ -138,22 +139,8 @@ mod prelude {
 	#[cfg(feature = "hashbrown")]
 	pub use self::hashbrown::{HashMap, HashSet, hash_map};
 
-	#[cfg(feature = "std")]
-	pub use std::io::sink;
-
-	#[cfg(not(feature = "std"))]
-	pub use io_extras::sink;
-
-	#[cfg(feature = "std")]
-	pub use std::io::copy;
-
-	#[cfg(not(feature = "std"))]
-	pub use io_extras::copy;
-
 	pub use alloc::borrow::ToOwned;
 	pub use alloc::string::ToString;
-
-	pub use io_extras::read_to_end;
 }
 
 #[cfg(feature = "std")]

lightning/src/ln/msgs.rs

@@ -36,6 +36,7 @@ use prelude::*;
 use core::{cmp, fmt};
 use core::fmt::Debug;
 use io::{self, Read};
+use io_extras::read_to_end;
 
 use util::events::MessageSendEventsProvider;
 use util::logger;

lightning/src/util/ser.rs

@@ -12,6 +12,7 @@
 
 use prelude::*;
 use io::{self, Read, Write};
+use io_extras::{copy, sink};
 use core::hash::Hash;
 use sync::Mutex;
 use core::cmp;

lightning/src/util/transaction_utils.rs

@@ -15,6 +15,7 @@ use bitcoin::consensus::encode::VarInt;
 use ln::msgs::MAX_VALUE_MSAT;
 
 use prelude::*;
+use io_extras::sink;
 use core::cmp::Ordering;
 
 pub fn sort_outputs<T, C : Fn(&T, &T) -> Ordering>(outputs: &mut Vec<(TxOut, T)>, tie_breaker: C) {