aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTeddy Wing2016-04-27 06:10:15 -0400
committerTeddy Wing2016-04-27 06:10:15 -0400
commit07505d78a316cff202e0dea43a43a96b78fef037 (patch)
tree97edb00d77cb39866f0b9ab4abf0b126a488bb03
parent2b99fd30c28fecc95d9425f229eab426080dbc85 (diff)
parent78e7b4c607d8fc3b35f90ed88614093bda437195 (diff)
downloadmutt-alias-auto-add-07505d78a316cff202e0dea43a43a96b78fef037.tar.bz2
Merge branch 'stream-did-not-contain-valid-utf8-error'
-rw-r--r--src/alias.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/alias.rs b/src/alias.rs
index 0fd05d2..2e7da81 100644
--- a/src/alias.rs
+++ b/src/alias.rs
@@ -54,8 +54,9 @@ impl Alias {
let mut matches = Vec::new();
let f = try!(File::open(file));
let file = BufReader::new(&f);
- for line in file.lines() {
+ for line in file.split(b'\n') {
let line = try!(line);
+ let line = latin1_to_string(line);
let split: Vec<&str> = line.split_whitespace().collect();
if line.contains(&self.email) {
@@ -94,6 +95,10 @@ impl Alias {
}
}
+fn latin1_to_string(s: Vec<u8>) -> String {
+ s.iter().map(|c| c.clone() as char).collect()
+}
+
#[derive(Debug)]
pub enum AliasSearchError {
NotFound,