Skip to content

Commit

Permalink
Downgrade indicatif and xwin
Browse files Browse the repository at this point in the history
Fix build on some 32-bit platforms caused by console-rs/indicatif#475

* Reverts 377aa75
* Reverts 310463f
  • Loading branch information
messense committed Oct 9, 2022
1 parent f0931a9 commit 4b0e628
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 20 deletions.
16 changes: 8 additions & 8 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ cargo-options = "0.4.0"
clap = { version = "3.1.2", features = ["derive", "env", "wrap_help"] }
dirs = "4.0.0"
fs-err = "2.7.0"
indicatif = "0.17.0"
indicatif = "0.17.0-rc.6"
path-slash = "0.2.0"
which = "4.2.4"
xwin = { version = "0.2.8", default-features = false }
xwin = { version = "=0.2.5", default-features = false }

[features]
# By default we use rustls for TLS
Expand Down
13 changes: 3 additions & 10 deletions src/common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ impl XWinOptions {
.xwin_variant
.iter()
.fold(0, |acc, var| acc | *var as u32);
let pruned = xwin::prune_pkg_list(&pkg_manifest, arches, variants, false)?;
let pruned = xwin::prune_pkg_list(&pkg_manifest, arches, variants)?;
let op = xwin::Ops::Splat(xwin::SplatConfig {
include_debug_libs: false,
include_debug_symbols: false,
Expand All @@ -252,20 +252,13 @@ impl XWinOptions {
.map(|pay| {
let prefix = match pay.kind {
xwin::PayloadKind::CrtHeaders => "CRT.headers".to_owned(),
xwin::PayloadKind::AtlHeaders => "ATL.headers".to_owned(),
xwin::PayloadKind::CrtLibs => {
format!(
"CRT.libs.{}.{}",
pay.target_arch.map(|ta| ta.as_str()).unwrap_or("all"),
pay.variant.map(|v| v.as_str()).unwrap_or("none")
)
}
xwin::PayloadKind::AtlLibs => {
format!(
"ATL.libs.{}",
pay.target_arch.map(|ta| ta.as_str()).unwrap_or("all"),
)
}
xwin::PayloadKind::SdkHeaders => {
format!(
"SDK.headers.{}.{}",
Expand All @@ -284,7 +277,7 @@ impl XWinOptions {
};

let pb = mp.add(
ProgressBar::with_draw_target(Some(0), draw_target.into()).with_prefix(prefix).with_style(
ProgressBar::with_draw_target(0, draw_target.into()).with_prefix(prefix).with_style(
ProgressStyle::default_bar()
.template("{spinner:.green} {prefix:.bold} [{elapsed}] {wide_bar:.green} {bytes}/{total_bytes} {msg}").unwrap()
.progress_chars("=> "),
Expand Down Expand Up @@ -323,7 +316,7 @@ impl XWinOptions {
ctx: &xwin::Ctx,
dt: ProgressTarget,
) -> Result<xwin::manifest::PackageManifest> {
let manifest_pb = ProgressBar::with_draw_target(Some(0), dt.into())
let manifest_pb = ProgressBar::with_draw_target(0, dt.into())
.with_style(
ProgressStyle::default_bar()
.template(
Expand Down

0 comments on commit 4b0e628

Please sign in to comment.