i3status-rust: update to 0.11.0

This commit is contained in:
Jan Christian Grünhage 2019-10-09 12:54:43 +02:00 committed by John Zimmermann
parent 878ac9e714
commit 148c2e8f0e
2 changed files with 11 additions and 15 deletions

View file

@ -5,20 +5,20 @@ diff --git a/src/blocks/disk_space.rs b/src/blocks/disk_space.rs
let mut result; let mut result;
let mut converted = 0.0f64; let mut converted = 0.0f64;
let mut converted_str = String::new(); let mut converted_str = String::new();
- let total = statvfs.blocks() * statvfs.fragment_size(); - let total = (statvfs.blocks() * statvfs.fragment_size()) as u64;
- let used = (statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size(); - let used = ((statvfs.blocks() - statvfs.blocks_free()) * statvfs.fragment_size()) as u64;
+ let total = (statvfs.blocks() as u64 * statvfs.fragment_size() as u64) as u64; + let total = (statvfs.blocks() as u64) * (statvfs.fragment_size() as u64);
+ let used = ((statvfs.blocks() as u64 - statvfs.blocks_free() as u64) * statvfs.fragment_size() as u64) as u64; + let used = ((statvfs.blocks() as u64) - (statvfs.blocks_free() as u64)) * (statvfs.fragment_size() as u64);
match self.info_type { match self.info_type {
InfoType::Available => { InfoType::Available => {
- result = statvfs.blocks_available() * statvfs.block_size(); - result = (statvfs.blocks_available() * statvfs.block_size()) as u64;
+ result = (statvfs.blocks_available() as u64 * statvfs.block_size() as u64) as u64; + result = (statvfs.blocks_available() as u64) * (statvfs.block_size() as u64);
converted = Unit::bytes_in_unit(self.unit, result); converted = Unit::bytes_in_unit(self.unit, result);
} }
InfoType::Free => { InfoType::Free => {
- result = statvfs.blocks_free() * statvfs.block_size(); - result = (statvfs.blocks_free() * statvfs.block_size()) as u64;
+ result = (statvfs.blocks_free() as u64 * statvfs.block_size() as u64) as u64; + result = (statvfs.blocks_free() as u64) * (statvfs.block_size() as u64);
converted = Unit::bytes_in_unit(self.unit, result); converted = Unit::bytes_in_unit(self.unit, result);
} }
InfoType::Total => { InfoType::Total => {

View file

@ -1,7 +1,7 @@
# Template file for 'i3status-rust' # Template file for 'i3status-rust'
pkgname=i3status-rust pkgname=i3status-rust
version=0.10.0 version=0.11.0
revision=3 revision=1
build_style=cargo build_style=cargo
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="dbus-devel pulseaudio-devel" makedepends="dbus-devel pulseaudio-devel"
@ -10,8 +10,4 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
license="GPL-3.0-only" license="GPL-3.0-only"
homepage="https://github.com/greshake/i3status-rust" homepage="https://github.com/greshake/i3status-rust"
distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz" distfiles="https://github.com/greshake/i3status-rust/archive/v${version}.tar.gz"
checksum=84a12a91419fda35109a0be3980671c1d58e13c5987e6dc999cbe786d05053d9 checksum=2f749ba4646e2fc0af62d31c990ae8d59d454eb0e5fe947b39d64cfeabbb0a1c
case "$XBPS_TARGET_MACHINE" in
ppc*) broken="old broken version of nix (0.8.1) in dep tree" ;;
esac