summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-02-27 13:09:46 +0100
committerLinus Färnstrand <linus@mullvad.net>2018-03-05 21:37:20 +0100
commitc669ccadf1b0448b4d0a0422d49387e07ca7fb46 (patch)
treef0d38a8ee3e11702495aaab113cd00f8d74c4eff
parent982c42a4ed820da09ae5e172fb553ffc6ade1007 (diff)
downloadmullvadvpn-c669ccadf1b0448b4d0a0422d49387e07ca7fb46.tar.xz
mullvadvpn-c669ccadf1b0448b4d0a0422d49387e07ca7fb46.zip
Change String into &str where appropriate
-rw-r--r--mullvad-daemon/src/bin/problem-report.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/mullvad-daemon/src/bin/problem-report.rs b/mullvad-daemon/src/bin/problem-report.rs
index 5ae9c27351..f993ccb5cb 100644
--- a/mullvad-daemon/src/bin/problem-report.rs
+++ b/mullvad-daemon/src/bin/problem-report.rs
@@ -196,15 +196,15 @@ impl ProblemReport {
/// contents if error occurred when reading log file.
pub fn add_log(&mut self, path: &Path) {
let content = self.redact(
- read_file_lossy(path, LOG_MAX_READ_BYTES)
+ &read_file_lossy(path, LOG_MAX_READ_BYTES)
.chain_err(|| ErrorKind::ReadLogError(path.to_path_buf()))
.unwrap_or_else(|e| e.display_chain().to_string()),
);
- let path = self.redact(path.to_string_lossy().into_owned());
+ let path = self.redact(&path.to_string_lossy());
self.logs.push((path, content));
}
- fn redact(&self, input: String) -> String {
+ fn redact(&self, input: &str) -> String {
let mut out = self.redact_home_dir(input);
out = self.redact_network_info(&out);
@@ -212,10 +212,10 @@ impl ProblemReport {
self.redact_custom_strings(out)
}
- fn redact_home_dir(&self, input: String) -> String {
+ fn redact_home_dir(&self, input: &str) -> String {
match env::home_dir() {
Some(home) => input.replace(home.to_string_lossy().as_ref(), "~"),
- None => input,
+ None => input.to_owned(),
}
}