summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-03-26 15:01:55 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-03-26 15:02:12 +0200
commit24275418c20230bfc86448280cd369c24e652096 (patch)
treed87fefafbe0295a68c4c17d063aa93321219381f /mullvad-cli/src
parentbdc0fe955e4f39adeba472c79802a455fc6a0cf4 (diff)
downloadmullvadvpn-24275418c20230bfc86448280cd369c24e652096.tar.xz
mullvadvpn-24275418c20230bfc86448280cd369c24e652096.zip
Format code with newer rustfmt
Diffstat (limited to 'mullvad-cli/src')
-rw-r--r--mullvad-cli/src/cmds/account.rs2
-rw-r--r--mullvad-cli/src/cmds/lan.rs2
-rw-r--r--mullvad-cli/src/cmds/relay.rs2
-rw-r--r--mullvad-cli/src/cmds/shutdown.rs2
-rw-r--r--mullvad-cli/src/cmds/tunnel.rs2
-rw-r--r--mullvad-cli/src/main.rs2
-rw-r--r--mullvad-cli/src/rpc.rs2
7 files changed, 7 insertions, 7 deletions
diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index 1475c333a7..40985c9431 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -1,5 +1,5 @@
-use {Command, Result};
use clap;
+use {Command, Result};
use mullvad_types::account::{AccountData, AccountToken};
use rpc;
diff --git a/mullvad-cli/src/cmds/lan.rs b/mullvad-cli/src/cmds/lan.rs
index 0c0fc51d20..05fa2279bc 100644
--- a/mullvad-cli/src/cmds/lan.rs
+++ b/mullvad-cli/src/cmds/lan.rs
@@ -1,6 +1,6 @@
-use {Command, Result};
use clap;
use rpc;
+use {Command, Result};
pub struct Lan;
diff --git a/mullvad-cli/src/cmds/relay.rs b/mullvad-cli/src/cmds/relay.rs
index e87512e0c2..913b3b3a33 100644
--- a/mullvad-cli/src/cmds/relay.rs
+++ b/mullvad-cli/src/cmds/relay.rs
@@ -1,6 +1,6 @@
-use {Command, Result, ResultExt};
use clap;
use std::str::FromStr;
+use {Command, Result, ResultExt};
use mullvad_types::CustomTunnelEndpoint;
use mullvad_types::relay_constraints::{Constraint, LocationConstraint, OpenVpnConstraints,
diff --git a/mullvad-cli/src/cmds/shutdown.rs b/mullvad-cli/src/cmds/shutdown.rs
index 4a334da5a5..a31c32f783 100644
--- a/mullvad-cli/src/cmds/shutdown.rs
+++ b/mullvad-cli/src/cmds/shutdown.rs
@@ -1,5 +1,5 @@
-use {Command, Result};
use clap;
+use {Command, Result};
use rpc;
diff --git a/mullvad-cli/src/cmds/tunnel.rs b/mullvad-cli/src/cmds/tunnel.rs
index 489e3d1bc9..f12f17f533 100644
--- a/mullvad-cli/src/cmds/tunnel.rs
+++ b/mullvad-cli/src/cmds/tunnel.rs
@@ -1,5 +1,5 @@
-use {Command, Result};
use clap;
+use {Command, Result};
use rpc;
use talpid_types::net::{OpenVpnTunnelOptions, TunnelOptions};
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs
index 5a77c7148d..69b9c8905b 100644
--- a/mullvad-cli/src/main.rs
+++ b/mullvad-cli/src/main.rs
@@ -20,8 +20,8 @@ extern crate serde;
extern crate talpid_ipc;
extern crate talpid_types;
-mod rpc;
mod cmds;
+mod rpc;
use std::io;
diff --git a/mullvad-cli/src/rpc.rs b/mullvad-cli/src/rpc.rs
index 2e1da7e528..b6e4a6c4b0 100644
--- a/mullvad-cli/src/rpc.rs
+++ b/mullvad-cli/src/rpc.rs
@@ -1,5 +1,5 @@
-use {Result, ResultExt};
use serde;
+use {Result, ResultExt};
use std::fs::{File, Metadata};
use std::io::{BufRead, BufReader};