summaryrefslogtreecommitdiffhomepage
path: root/mullvad-cli/src/cmds/patch.rs
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2024-06-24 09:13:56 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-06-24 09:13:56 +0200
commitd9337b72b2cdda5388b2b57cce49519a2f765fcc (patch)
treed0892de4376df331afca1e5090913c9d67a899c8 /mullvad-cli/src/cmds/patch.rs
parent02089db6e0494e1a86f135f9a12f1c209314f499 (diff)
parent8c9cb717c020072a3859fe3d44f6147c37c67c33 (diff)
downloadmullvadvpn-d9337b72b2cdda5388b2b57cce49519a2f765fcc.tar.xz
mullvadvpn-d9337b72b2cdda5388b2b57cce49519a2f765fcc.zip
Merge branch 'nightly-fmt'
Diffstat (limited to 'mullvad-cli/src/cmds/patch.rs')
-rw-r--r--mullvad-cli/src/cmds/patch.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/mullvad-cli/src/cmds/patch.rs b/mullvad-cli/src/cmds/patch.rs
index 2aa48f2b2f..cd1a970a3b 100644
--- a/mullvad-cli/src/cmds/patch.rs
+++ b/mullvad-cli/src/cmds/patch.rs
@@ -9,8 +9,7 @@ use std::{
/// application.
///
/// * If `source` is "-", read the patch from standard input
-/// * Otherwise, interpret `source` as a filepath and read from the provided
-/// file
+/// * Otherwise, interpret `source` as a filepath and read from the provided file
pub async fn import(source: String) -> Result<()> {
let json_blob = tokio::task::spawn_blocking(move || match source.as_str() {
"-" => read_to_string(BufReader::new(stdin())).context("Failed to read from stdin"),
@@ -33,8 +32,7 @@ pub async fn import(source: String) -> Result<()> {
/// Output a settings patch including all currently patchable settings.
///
/// * If `source` is "-", write the patch to standard output
-/// * Otherwise, interpret `source` as a filepath and write to the provided
-/// file
+/// * Otherwise, interpret `source` as a filepath and write to the provided file
pub async fn export(dest: String) -> Result<()> {
let mut rpc = MullvadProxyClient::new().await?;
let blob = rpc