diff --git a/CHANGELOG.md b/CHANGELOG.md index 145ef4e..e54854c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ - Added support for `Power * Time` - Added support for `Energy / Time` - Fixed interpreting of `µs` +- Fixed panics caused in Rust `1.48.0` by specifying `decimal` as a git dependency. ## 1.1.0 - 2020 Nov 14 - Added units of frequency diff --git a/Cargo.lock b/Cargo.lock index d0b82c2..18587c7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,57 +4,54 @@ name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" [[package]] name = "cc" version = "1.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" [[package]] name = "cpc" version = "1.1.0" dependencies = [ - "decimal 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "decimal", ] [[package]] name = "decimal" version = "2.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" +source = "git+https://github.com/probablykasper/decimal-uninit-fix-mirror?branch=uninit-fix#c0b91e05523b77705367f9e769cef335c004086a" dependencies = [ - "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)", - "ord_subset 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags", + "cc", + "libc", + "ord_subset", + "rustc-serialize", + "serde", ] [[package]] name = "libc" version = "0.2.66" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" [[package]] name = "ord_subset" version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7ce14664caf5b27f5656ff727defd68ae1eb75ef3c4d95259361df1eb376bef" [[package]] name = "rustc-serialize" version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" [[package]] name = "serde" version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" - -[metadata] -"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -"checksum cc 1.0.48 (registry+https://github.com/rust-lang/crates.io-index)" = "f52a465a666ca3d838ebbf08b241383421412fe7ebb463527bba275526d89f76" -"checksum decimal 2.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "e6458723bc760383275fbc02f4c769b2e5f3de782abaf5e7e0b9b7f0368a63ed" -"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558" -"checksum ord_subset 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d7ce14664caf5b27f5656ff727defd68ae1eb75ef3c4d95259361df1eb376bef" -"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda" -"checksum serde 1.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" +checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" diff --git a/Cargo.toml b/Cargo.toml index a7f8767..61f685a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,4 +13,5 @@ keywords = ["math", "expression", "evaluate", "units", "convert"] categories = ["mathematics", "science", "parsing", "text-processing", "value-formatting"] [dependencies] -decimal = "2.0.4" +# decimal = "2.0.4" +decimal = { git = "https://github.com/probablykasper/decimal-uninit-fix-mirror", branch = "uninit-fix" }