From dccae18b53d342f3362ecc0b83b3e07d130dc179 Mon Sep 17 00:00:00 2001 From: Rob Walker Date: Tue, 14 Aug 2018 12:04:32 -0700 Subject: [PATCH] cfg=erasure fixes, use return value of align!() --- src/erasure.rs | 2 +- src/retransmit_stage.rs | 2 -- src/streamer.rs | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/erasure.rs b/src/erasure.rs index 85c7b6f0dd..4a953faf61 100644 --- a/src/erasure.rs +++ b/src/erasure.rs @@ -254,7 +254,7 @@ pub fn generate_coding( } // round up to the nearest jerasure alignment - align!(max_data_size, JERASURE_ALIGN); + max_data_size = align!(max_data_size, JERASURE_ALIGN); trace!("{:x} max_data_size: {}", debug_id, max_data_size); diff --git a/src/retransmit_stage.rs b/src/retransmit_stage.rs index 1e770f8a30..29b1e22d63 100644 --- a/src/retransmit_stage.rs +++ b/src/retransmit_stage.rs @@ -2,8 +2,6 @@ use counter::Counter; use crdt::Crdt; -#[cfg(feature = "erasure")] -use erasure; use log::Level; use packet::BlobRecycler; use result::{Error, Result}; diff --git a/src/streamer.rs b/src/streamer.rs index bf1cc19a91..e6cbfccc24 100644 --- a/src/streamer.rs +++ b/src/streamer.rs @@ -1,7 +1,5 @@ //! The `streamer` module defines a set of services for efficiently pulling data from UDP sockets. //! -#[cfg(feature = "erasure")] -use erasure; use packet::{Blob, BlobRecycler, PacketRecycler, SharedBlobs, SharedPackets}; use result::{Error, Result}; use std::net::UdpSocket;