Skip to content

enable progress bar on all UNIX platforms #8054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 30, 2020
Merged

enable progress bar on all UNIX platforms #8054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 2 additions & 20 deletions src/cargo/core/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ impl ColorChoice {
}
}

#[cfg(any(target_os = "linux", target_os = "macos", target_os = "freebsd"))]
#[cfg(unix)]
mod imp {
use super::Shell;
use std::mem;
Expand Down Expand Up @@ -408,18 +408,6 @@ mod imp {
}
}

#[cfg(all(
unix,
not(any(target_os = "linux", target_os = "macos", target_os = "freebsd"))
))]
mod imp {
pub(super) use super::default_err_erase_line as err_erase_line;

pub fn stderr_width() -> Option<usize> {
None
}
}

#[cfg(windows)]
mod imp {
use std::{cmp, mem, ptr};
Expand Down Expand Up @@ -476,13 +464,7 @@ mod imp {
}
}

#[cfg(any(
all(
unix,
not(any(target_os = "linux", target_os = "macos", target_os = "freebsd"))
),
windows,
))]
#[cfg(windows)]
fn default_err_erase_line(shell: &mut Shell) {
if let Some(max_width) = imp::stderr_width() {
let blank = " ".repeat(max_width);
Expand Down