From 7f1258f0911877c83fc34a96a28f0c85cf2708d1 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Tue, 15 Jan 2019 03:47:57 -0800 Subject: [PATCH] commitcloudsubscriber: use Fallible Summary: Use the `Fallible` type alias provided by `failure` rather than defining our own. Differential Revision: D13657314 fbshipit-source-id: f1a379089972f7f0066c49ddedf606d36b7ac260 --- lib/commitcloudsubscriber/src/action.rs | 3 ++- lib/commitcloudsubscriber/src/error.rs | 3 --- lib/commitcloudsubscriber/src/receiver.rs | 4 ++-- lib/commitcloudsubscriber/src/subscriber.rs | 11 ++++++----- lib/commitcloudsubscriber/src/util.rs | 5 +++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lib/commitcloudsubscriber/src/action.rs b/lib/commitcloudsubscriber/src/action.rs index 71b347eb43..b4430aebe7 100644 --- a/lib/commitcloudsubscriber/src/action.rs +++ b/lib/commitcloudsubscriber/src/action.rs @@ -4,6 +4,7 @@ // GNU General Public License version 2 or any later version. use error::*; +use failure::Fallible; use std::path::Path; use std::process::{Command, Stdio}; use std::time::Instant; @@ -17,7 +18,7 @@ impl CloudSyncTrigger { retries: u32, version: Option, try_direct_fetching: bool, - ) -> Result<()> { + ) -> Fallible<()> { let mut version_args = vec![]; if let Some(version) = version { version_args.append(&mut vec![ diff --git a/lib/commitcloudsubscriber/src/error.rs b/lib/commitcloudsubscriber/src/error.rs index 7a2d3edac8..49a634aeb8 100644 --- a/lib/commitcloudsubscriber/src/error.rs +++ b/lib/commitcloudsubscriber/src/error.rs @@ -5,7 +5,6 @@ #![deny(warnings)] -pub use failure::Error; use std::fmt; #[derive(Debug, Fail)] @@ -36,5 +35,3 @@ impl fmt::Display for CommitCloudHttpError { ) } } - -pub type Result = ::std::result::Result; diff --git a/lib/commitcloudsubscriber/src/receiver.rs b/lib/commitcloudsubscriber/src/receiver.rs index 0b438ac5d6..fd8246b4a7 100644 --- a/lib/commitcloudsubscriber/src/receiver.rs +++ b/lib/commitcloudsubscriber/src/receiver.rs @@ -3,7 +3,7 @@ // This software may be used and distributed according to the terms of the // GNU General Public License version 2 or any later version. -use error::*; +use failure::Fallible; use serde_json; use std::collections::HashMap; use std::net::{SocketAddr, TcpListener}; @@ -58,7 +58,7 @@ impl TcpReceiverService { self } - pub fn serve(self) -> Result>> { + pub fn serve(self) -> Fallible>> { let listener = TcpListener::bind(SocketAddr::from(([127, 0, 0, 1], self.port)))?; Ok(thread::spawn(move || { info!("Starting CommitCloud TcpReceiverService"); diff --git a/lib/commitcloudsubscriber/src/subscriber.rs b/lib/commitcloudsubscriber/src/subscriber.rs index 7e90bfe766..ca395d3b0f 100644 --- a/lib/commitcloudsubscriber/src/subscriber.rs +++ b/lib/commitcloudsubscriber/src/subscriber.rs @@ -7,6 +7,7 @@ use action::CloudSyncTrigger; use config::CommitCloudConfig; use error::*; use eventsource::reqwest::Client; +use failure::Fallible; use receiver::CommandName::{self, CommitCloudCancelSubscriptions, CommitCloudRestartSubscriptions, CommitCloudStartSubscriptions}; use reqwest::Url; @@ -132,7 +133,7 @@ pub struct WorkspaceSubscriberService { } impl WorkspaceSubscriberService { - pub fn new(config: &CommitCloudConfig) -> Result { + pub fn new(config: &CommitCloudConfig) -> Fallible { Ok(WorkspaceSubscriberService { notification_url: config .notification_url @@ -198,7 +199,7 @@ impl WorkspaceSubscriberService { actions } - pub fn serve(self) -> Result>> { + pub fn serve(self) -> Fallible>> { self.channel.0.send(CommitCloudStartSubscriptions)?; Ok(thread::spawn(move || { info!("Starting CommitCloud WorkspaceSubscriberService"); @@ -264,13 +265,13 @@ impl WorkspaceSubscriberService { /// It starts all the requested subscriptions by simply runing a separate thread for each one /// All threads keep checking the interrupt flag and join gracefully if it is restart or stop - fn run_subscriptions(&self, access_token: util::Token) -> Result>> { + fn run_subscriptions(&self, access_token: util::Token) -> Fallible>> { util::read_subscriptions(&self.connected_subscribers_path)? .into_iter() .map(|(subscription, repo_roots)| { self.run_subscription(access_token.clone(), subscription, repo_roots) }) - .collect::>>>() + .collect::>>>() } /// Helper function to run a single subscription @@ -280,7 +281,7 @@ impl WorkspaceSubscriberService { access_token: util::Token, subscription: Subscription, repo_roots: Vec, - ) -> Result> { + ) -> Fallible> { let mut notification_url = Url::parse(&self.notification_url)?; let service_url = Url::parse(&self.service_url)?; diff --git a/lib/commitcloudsubscriber/src/util.rs b/lib/commitcloudsubscriber/src/util.rs index a438f90a7e..b67ea5ac5f 100644 --- a/lib/commitcloudsubscriber/src/util.rs +++ b/lib/commitcloudsubscriber/src/util.rs @@ -4,6 +4,7 @@ // GNU General Public License version 2 or any later version. use error::*; +use failure::Fallible; use ini::Ini; use std::{fs, io}; use std::collections::HashMap; @@ -23,7 +24,7 @@ static JOINED: &str = "joined"; /// Map from a subscription to list of repo roots pub fn read_subscriptions( joined_pool_path: &PathBuf, -) -> Result>> { +) -> Fallible>> { let mut joined_pool_path = joined_pool_path.clone(); joined_pool_path.push(JOINED_DIR); joined_pool_path.push(JOINED); @@ -141,7 +142,7 @@ pub struct Token { pub(crate) token_type: TokenType, } -pub fn read_access_token(user_token_path: &Option) -> Result { +pub fn read_access_token(user_token_path: &Option) -> Fallible { // try to read token from file let token = if let &Some(ref user_token_path) = user_token_path { let mut user_token_path = user_token_path.clone();