From b88db6a8170f827a7adc58de14acb59f19be2db1 Mon Sep 17 00:00:00 2001 From: mtsoltan Date: Mon, 30 Aug 2021 12:53:39 +0200 Subject: [PATCH] Used .as_path() and .as_str() when required: when the argument required is a Path and not a PathBuf, or an str and not a Path, respectively. --- src/uu/ls/src/ls.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs index 3d957474c..2914b5690 100644 --- a/src/uu/ls/src/ls.rs +++ b/src/uu/ls/src/ls.rs @@ -1238,7 +1238,7 @@ impl PathData { fn md(&self) -> Option<&Metadata> { self.md - .get_or_init(|| get_metadata(&self.p_buf, self.must_dereference).ok()) + .get_or_init(|| get_metadata(&self.p_buf.as_path(), self.must_dereference).ok()) .as_ref() } @@ -1799,7 +1799,7 @@ fn classify_file(path: &PathData) -> Option { } fn display_file_name(path: &PathData, config: &Config) -> Option { - let mut name = escape_name(&path.display_name, &config.quoting_style); + let mut name = escape_name(&path.display_name.as_str(), &config.quoting_style); #[cfg(unix)] { @@ -1817,7 +1817,7 @@ fn display_file_name(path: &PathData, config: &Config) -> Option { let mut width = name.width(); if let Some(ls_colors) = &config.color { - name = color_name(ls_colors, &path.p_buf, name, path.md()?); + name = color_name(ls_colors, &path.p_buf.as_path(), name, path.md()?); } if config.indicator_style != IndicatorStyle::None {