summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-09-19 09:02:25 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-09-19 09:02:25 +0200
commit036e10fe4846679f710cf5a3571a730ce42563d4 (patch)
treec9ab111dc803f6ba4d1a5d43fc18ba99351d1b10
parent87a0ab01ae8f82ea7f7592b4b59899e479391419 (diff)
downloadmullvadvpn-036e10fe4846679f710cf5a3571a730ce42563d4.tar.xz
mullvadvpn-036e10fe4846679f710cf5a3571a730ce42563d4.zip
Fix comments split over multiple lines
-rw-r--r--mullvad-daemon/src/main.rs3
-rw-r--r--talpid-core/src/process/openvpn.rs6
2 files changed, 3 insertions, 6 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index ed39e2c147..f252d762d3 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -458,8 +458,7 @@ impl Daemon {
}
/// Set the target state of the client. If it changed trigger the operations needed to
- /// progress
- /// towards that state.
+ /// progress towards that state.
fn set_target_state(&mut self, new_state: TargetState) -> Result<()> {
if new_state != self.target_state {
debug!("Target state {:?} => {:?}", self.target_state, new_state);
diff --git a/talpid-core/src/process/openvpn.rs b/talpid-core/src/process/openvpn.rs
index ce6039bcb3..046d70b569 100644
--- a/talpid-core/src/process/openvpn.rs
+++ b/talpid-core/src/process/openvpn.rs
@@ -65,8 +65,7 @@ impl OpenVpnCommand {
}
/// Sets the path to the file where the username and password for user-pass authentication
- /// is
- /// stored. See the `--auth-user-pass` OpenVPN documentation for details.
+ /// is stored. See the `--auth-user-pass` OpenVPN documentation for details.
pub fn user_pass<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
self.user_pass_path = Some(path.as_ref().to_path_buf());
self
@@ -162,8 +161,7 @@ impl OpenVpnCommand {
impl fmt::Display for OpenVpnCommand {
/// Format the program and arguments of an `OpenVpnCommand` for display. Any non-utf8 data
- /// is
- /// lossily converted using the utf8 replacement character.
+ /// is lossily converted using the utf8 replacement character.
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
fmt.write_str(&self.openvpn_bin.to_string_lossy())?;
for arg in self.get_arguments().iter().map(|arg| arg.to_string_lossy()) {