From d219b6e705b8f48a73f19481aad4fdd9b25beca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Reto=20Habl=C3=BCtzel?= Date: Mon, 12 Apr 2021 19:50:23 +0200 Subject: [PATCH] strip_suffix is not avaialble with rust 1.40 --- src/uu/basename/src/basename.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/uu/basename/src/basename.rs b/src/uu/basename/src/basename.rs index b7f99af27..84521bdd1 100644 --- a/src/uu/basename/src/basename.rs +++ b/src/uu/basename/src/basename.rs @@ -113,8 +113,12 @@ fn basename(fullname: &str, suffix: &str) -> String { fn strip_suffix(name: &str, suffix: &str) -> String { if name == suffix { - name.to_owned() - } else { - name.strip_suffix(suffix).unwrap_or(name).to_owned() + return name.to_owned(); } + + if name.ends_with(suffix) { + return name[..name.len() - suffix.len()].to_owned(); + } + + name.to_owned() }