summaryrefslogtreecommitdiffhomepage
path: root/talpid_cli/src/main.rs
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-04-18 15:22:24 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-04-18 15:22:24 +0200
commit1ff09656b1fe97008fa6efaee6078d35528fcc66 (patch)
tree235f3bbc78f511e93948534f1ec038a2de52807b /talpid_cli/src/main.rs
parent7b054cf70ef6eaccc3886364fecf8814a541a00b (diff)
downloadmullvadvpn-1ff09656b1fe97008fa6efaee6078d35528fcc66.tar.xz
mullvadvpn-1ff09656b1fe97008fa6efaee6078d35528fcc66.zip
Reformat with new rustfmt settings
Diffstat (limited to 'talpid_cli/src/main.rs')
-rw-r--r--talpid_cli/src/main.rs18
1 files changed, 11 insertions, 7 deletions
diff --git a/talpid_cli/src/main.rs b/talpid_cli/src/main.rs
index e07a8126a7..0a857e05d3 100644
--- a/talpid_cli/src/main.rs
+++ b/talpid_cli/src/main.rs
@@ -39,7 +39,8 @@ pub fn init_logger() -> Result<()> {
fn create_openvpn_command(args: &Args) -> OpenVpnCommand {
let mut command = OpenVpnCommand::new(&args.binary);
- command.config(&args.config)
+ command
+ .config(&args.config)
.remotes(&args.remotes[..])
.unwrap()
.pipe_output(args.verbosity > 0);
@@ -70,12 +71,15 @@ fn start_monitor(monitor: &mut OpenVpnMonitor)
-> StdResult<Receiver<OpenVpnEvent>, openvpn::Error> {
let (tx, rx) = mpsc::channel();
let callback = move |clean| tx.send(clean).unwrap();
- monitor.start(callback)
- .map(|(stdout, stderr)| {
- stdout.map(|stream| pass_io(stream, io::stdout()));
- stderr.map(|stream| pass_io(stream, io::stderr()));
- rx
- })
+ monitor
+ .start(callback)
+ .map(
+ |(stdout, stderr)| {
+ stdout.map(|stream| pass_io(stream, io::stdout()));
+ stderr.map(|stream| pass_io(stream, io::stderr()));
+ rx
+ },
+ )
}
fn pass_io<I, O>(mut input: I, mut output: O)