From 32b0a80a18dddbcc37efcb2e48270b073cb71e30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomasz@ethcore.io>
Date: Thu, 7 Apr 2016 12:55:06 +0200
Subject: [PATCH] Removing Option from setup_rpc_server method return type

---
 parity/main.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/parity/main.rs b/parity/main.rs
index 80c3feac6..f951a283b 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -262,7 +262,7 @@ fn setup_rpc_server(
 	url: &str,
 	cors_domain: &str,
 	apis: Vec<&str>
-) -> Option<Box<Any>> {
+) -> Box<Any> {
 	use rpc::v1::*;
 
 	let server = rpc::RpcServer::new();
@@ -284,7 +284,7 @@ fn setup_rpc_server(
 	match start_result {
 		Err(rpc::RpcServerError::IoError(err)) => die_with_io_error(err),
 		Err(e) => die!("{:?}", e),
-		Ok(handle) => Some(Box::new(handle)),
+		Ok(handle) => Box::new(handle),
 	}
 }
 
@@ -576,7 +576,7 @@ impl Configuration {
 			SocketAddr::from_str(&url).unwrap_or_else(|_| die!("{}: Invalid JSONRPC listen host/port given.", url));
 			let cors_domain = self.args.flag_rpccorsdomain.as_ref().unwrap_or(&self.args.flag_jsonrpc_cors);
 
-			setup_rpc_server(
+			Some(setup_rpc_server(
 				service.client(),
 				sync.clone(),
 				account_service.clone(),
@@ -584,7 +584,7 @@ impl Configuration {
 				&url,
 				&cors_domain,
 				apis.split(',').collect()
-			)
+			))
 		} else {
 			None
 		};