1
0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-12-01 01:04:00 +00:00

fix: Display durations of 0ms (#3121)

Previous code would render all components as empty, resulting
in an empty string even if min_time was 0. This adds a special
case which forces prompt to render "0ms"
This commit is contained in:
Lucien Fiorini 2021-12-20 22:58:25 +01:00 committed by GitHub
parent d0a6ce7faa
commit a8579d6f2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -454,6 +454,11 @@ fn internal_exec_cmd<T: AsRef<OsStr> + Debug, U: AsRef<OsStr> + Debug>(
// Render the time into a nice human-readable string // Render the time into a nice human-readable string
pub fn render_time(raw_millis: u128, show_millis: bool) -> String { pub fn render_time(raw_millis: u128, show_millis: bool) -> String {
// Make sure it renders something if the time equals zero instead of an empty string
if raw_millis == 0 {
return "0ms".into();
}
// Calculate a simple breakdown into days/hours/minutes/seconds/milliseconds // Calculate a simple breakdown into days/hours/minutes/seconds/milliseconds
let (millis, raw_seconds) = (raw_millis % 1000, raw_millis / 1000); let (millis, raw_seconds) = (raw_millis % 1000, raw_millis / 1000);
let (seconds, raw_minutes) = (raw_seconds % 60, raw_seconds / 60); let (seconds, raw_minutes) = (raw_seconds % 60, raw_seconds / 60);
@ -505,6 +510,10 @@ pub fn encode_to_hex(slice: &[u8]) -> String {
mod tests { mod tests {
use super::*; use super::*;
#[test]
fn test_0ms() {
assert_eq!(render_time(0_u128, true), "0ms")
}
#[test] #[test]
fn test_500ms() { fn test_500ms() {
assert_eq!(render_time(500_u128, true), "500ms") assert_eq!(render_time(500_u128, true), "500ms")