diff options
author | Sven-Hendrik Haase <svenstaro@gmail.com> | 2019-07-24 07:57:56 +0000 |
---|---|---|
committer | Sven-Hendrik Haase <svenstaro@gmail.com> | 2019-07-24 07:57:56 +0000 |
commit | 2c0b1bf34ddcd03be84fe55f2b19b7a3e13606f3 (patch) | |
tree | f0ab38c2ac9caee46c2f67dbed34066e9198f6f8 /src/renderer.rs | |
parent | Merge pull request #158 from wyhaya/master (diff) | |
download | miniserve-2c0b1bf34ddcd03be84fe55f2b19b7a3e13606f3.tar.gz miniserve-2c0b1bf34ddcd03be84fe55f2b19b7a3e13606f3.zip |
Fix tests
Diffstat (limited to '')
-rw-r--r-- | src/renderer.rs | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/src/renderer.rs b/src/renderer.rs index af8f5d7..cbad557 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -215,19 +215,11 @@ fn archive_button( } } -// Is there a trailing "/" -pub fn has_trailing(s: &str) -> bool { - match s.chars().last() { - Some(d) => d == '/', - None => false - } -} - -// Add trailing "/" if conditions permit -fn add_trailing(link: &str) -> String { - if has_trailing(&link) { +/// Ensure that there's always a trailing slash behind the `link`. +fn make_link_with_trailing_slash(link: &str) -> String { + if link.ends_with('/') { link.to_string() - }else { + } else { format!("{}/", link) } } @@ -244,7 +236,7 @@ fn parametrized_link( if let Some(order) = sort_order { let parametrized_link = format!( "{}?sort={}&order={}", - add_trailing(&link), + make_link_with_trailing_slash(&link), method, order ); @@ -260,12 +252,12 @@ fn parametrized_link( if color_scheme != default_color_scheme { return format!( "{}?theme={}", - add_trailing(&link), + make_link_with_trailing_slash(&link), color_scheme.to_slug() ); } - add_trailing(&link) + make_link_with_trailing_slash(&link) } /// Partial: table header link |