fix: Use dirs crate for home_dir() function

This commit is contained in:
Michael Aaron Murphy 2022-03-27 16:05:04 +02:00 committed by Michael Murphy
parent e578f2d19c
commit b770b59e7b
8 changed files with 10 additions and 6 deletions

View file

@ -46,7 +46,7 @@ impl Default for App {
fn default() -> Self {
Self {
entries: BTreeMap::default(),
home: std::env::home_dir().expect("no home dir"),
home: dirs::home_dir().expect("no home dir"),
out: async_stdout(),
search_results: Vec::with_capacity(100),
}

View file

@ -73,7 +73,7 @@ impl App {
let mut queue = VecDeque::new();
queue.push_back(
std::env::home_dir()
dirs::home_dir()
.expect("user does not have home dir")
.join(LOCAL_PATH),
);

View file

@ -57,7 +57,7 @@ const ALLOWED_FAVICON_MIME: [&str; 5] = [
impl Default for App {
fn default() -> Self {
let cache = std::env::home_dir()
let cache = dirs::home_dir()
.map(|cache| cache.join(".cache/pop-launcher"))
.expect("no home dir");
@ -228,8 +228,7 @@ async fn favicon_url_from_page_source(domain: &str, client: &HttpClient) -> Opti
.text()
.await
.ok()
.map(|html| parse_favicon(&html))
.flatten()
.and_then(|html| parse_favicon(&html))
.map(|icon_url| {
if !icon_url.starts_with("https://") {
format!("https://{}{}", domain, icon_url)