Prevent disconnect from within handler (and style cleanup)

ethcore/light/src/net/mod.rs

@@ -821,12 +821,15 @@ impl LightProtocol {
 		}));
 
 		let any_kept = self.handlers.iter().map(
-			|handler|
-			handler.on_connect(&Ctx {
-				peer: *peer,
-				io: io,
-				proto: self,
-			}, &status, &capabilities)
+			|handler| handler.on_connect(
+				&Ctx {
+					peer: *peer,
+					io: io,
+					proto: self,
+				},
+				&status,
+				&capabilities
+			)
 		).fold(PeerStatus::Kept, PeerStatus::bitor);
 
 		if any_kept == PeerStatus::Unkept {

ethcore/light/src/on_demand/mod.rs

@@ -30,15 +30,8 @@ use network::PeerId;
 use util::{RwLock, Mutex};
 
 use net::{
-	self,
-	Handler,
-	PeerStatus,
-	Status,
-	Capabilities,
-	Announcement,
-	EventContext,
-	BasicContext,
-	ReqId,
+	self, Handler, PeerStatus, Status, Capabilities,
+	Announcement, EventContext, BasicContext, ReqId,
 };
 use cache::Cache;
 use request::{self as basic_request, Request as NetworkRequest};