move request_builder -> request::builder

ethcore/light/src/net/context.rs

@@ -20,7 +20,7 @@ use network::{NetworkContext, PeerId, NodeId};
 
 use super::{Announcement, LightProtocol, ReqId};
 use super::error::Error;
-use request_builder::Requests;
+use request::Requests;
 
 /// An I/O context which allows sending and receiving packets as well as
 /// disconnecting peers. This is used as a generalization of the portions

ethcore/light/src/net/mod.rs

@@ -33,8 +33,7 @@ use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
 use provider::Provider;
-use request::{Request, Response};
-use request_builder::Requests;
+use request::{Request, Requests, Response};
 
 use self::request_credits::{Credits, FlowParams};
 use self::context::{Ctx, TickCtx};
@@ -665,7 +664,7 @@ impl LightProtocol {
 		// the maximum amount of requests we'll fill in a single packet.
 		const MAX_REQUESTS: usize = 256;
 
-		use ::request_builder::RequestBuilder;
+		use ::request::RequestBuilder;
 		use ::request::CompleteRequest;
 
 		let peers = self.peers.read();

ethcore/light/src/net/request_set.rs

@@ -25,7 +25,7 @@ use std::collections::{BTreeMap, HashMap};
 use std::iter::FromIterator;
 
 use request::Request;
-use request_builder::Requests;
+use request::Requests;
 use net::{timeout, ReqId};
 
 use time::{Duration, SteadyTime};
@@ -130,7 +130,7 @@ fn compute_timeout(reqs: &Requests) -> Duration {
 #[cfg(test)]
 mod tests {
 	use net::ReqId;
-	use request_builder::RequestBuilder;
+	use request::RequestBuilder;
 	use time::{SteadyTime, Duration};
 	use super::{RequestSet, compute_timeout};