From d1ae68585fe743d225bb39361bd383cb925b61f7 Mon Sep 17 00:00:00 2001 From: merkrafter Date: Wed, 10 Nov 2021 22:47:17 +0100 Subject: [PATCH] Make code compatible with rust 1.46 --- src/bin/hexyl.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/bin/hexyl.rs b/src/bin/hexyl.rs index 6373f77..e57ca71 100644 --- a/src/bin/hexyl.rs +++ b/src/bin/hexyl.rs @@ -356,14 +356,14 @@ impl Unit { const fn get_multiplier(self) -> i64 { match self { Self::Byte => 1, - Self::Kilobyte => 1000i64.pow(1), - Self::Megabyte => 1000i64.pow(2), - Self::Gigabyte => 1000i64.pow(3), - Self::Terabyte => 1000i64.pow(4), - Self::Kibibyte => 1024i64.pow(1), - Self::Mebibyte => 1024i64.pow(2), - Self::Gibibyte => 1024i64.pow(3), - Self::Tebibyte => 1024i64.pow(4), + Self::Kilobyte => 1000, + Self::Megabyte => 1000_000, + Self::Gigabyte => 1000_000_000, + Self::Terabyte => 1000_000_000_000, + Self::Kibibyte => 1 << 10, + Self::Mebibyte => 1 << 20, + Self::Gibibyte => 1 << 30, + Self::Tebibyte => 1 << 40, Self::Block { custom_size: Some(size), } => size.get(),