From 73ea0fa1c6c5e5d38ae0bbd0c17fa61c15bfe021 Mon Sep 17 00:00:00 2001 From: dvkt Date: Mon, 23 Dec 2019 00:36:04 -0800 Subject: [PATCH] fix bookmarks --- src/bookmarks.rs | 11 ++++++----- src/history.rs | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/bookmarks.rs b/src/bookmarks.rs index 1d3c62d..f305f5f 100644 --- a/src/bookmarks.rs +++ b/src/bookmarks.rs @@ -1,18 +1,19 @@ use config; +use std::io::Read; + const BOOKMARKS_FILE: &str = "bookmarks.gph"; pub fn as_raw_menu() -> String { - let mut out = vec![format!("i** bookmarks **\r\ni")]; + let mut out = format!("i** bookmarks **\r\ni\r\n"); config::load(BOOKMARKS_FILE) - .and_then(|reader| reader.read(&mut out)) + .and_then(|mut reader| reader.read_to_string(&mut out)) .map_err(|e| { - out.push(format!("3{}", e)); + out = format!("3{}", e); e }); - - out.join("\r\n") + out } // save a single history entry diff --git a/src/history.rs b/src/history.rs index 3357758..384d2fc 100644 --- a/src/history.rs +++ b/src/history.rs @@ -1,4 +1,5 @@ use config; +use std::io::BufRead; const HISTORY_FILE: &str = "history.gph"; @@ -7,7 +8,7 @@ pub fn as_raw_menu() -> String { config::load(HISTORY_FILE) .and_then(|reader| { - let lines = reader.lines(); + let mut lines = reader.lines(); while let Some(Ok(line)) = lines.next() { out.insert(1, line); }