Skip to content

Commit 4accfd8

Browse files
committed
Remove the "num" dependency.
This required a small change in the code that should be functionally exactly the same. Tests pass, seems good. The reason for removing this is to stop dependencies from mwalib depending on a specific, new version of "num". Reducing compile times is always good, too.
1 parent 68eb72e commit 4accfd8

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

Cargo.toml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mwalib"
3-
version = "0.9.3"
3+
version = "0.9.4"
44
homepage = "https://github.com/MWATelescope/mwalib"
55
repository = "https://github.com/MWATelescope/mwalib"
66
readme = "README.md"
@@ -34,9 +34,8 @@ fitsio-sys = "^0" # fitsio also uses fitsio-sys so ensure we both use the same
3434
lazy_static = "1.4.*"
3535
libc = "0.2.*"
3636
log = "0.4.*"
37-
num = "0.4"
38-
num-derive = "0.3"
39-
num-traits = "0.2"
37+
num-derive = "0.3.*"
38+
num-traits = "0.2.*"
4039
rayon = ">=1.3,<1.6" # Allow downstream users to select the rayon version to use.
4140
regex = "1.5.*"
4241
thiserror = "1.0.*"

src/metafits_context/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ impl MetafitsContext {
632632

633633
let geometric_delays_applied: GeometricDelaysApplied =
634634
match get_optional_fits_key!(&mut metafits_fptr, &metafits_hdu, "GEODEL")? {
635-
Some(g) => match num::FromPrimitive::from_i32(g) {
635+
Some(g) => match num_traits::FromPrimitive::from_i32(g) {
636636
Some(gda) => gda,
637637
None => {
638638
return Err(MwalibError::Parse {

src/metafits_context/test.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -544,18 +544,18 @@ fn test_geometric_delays_applied_enum() {
544544
assert!(GeometricDelaysApplied::from_str("Az/El Tracking").is_ok());
545545
assert!(GeometricDelaysApplied::from_str("something invalid").is_err());
546546

547-
let i32_none: GeometricDelaysApplied = num::FromPrimitive::from_i32(0).unwrap();
548-
let i32_zen: GeometricDelaysApplied = num::FromPrimitive::from_i32(1).unwrap();
549-
let i32_tile: GeometricDelaysApplied = num::FromPrimitive::from_i32(2).unwrap();
550-
let i32_azel: GeometricDelaysApplied = num::FromPrimitive::from_i32(3).unwrap();
547+
let i32_none: GeometricDelaysApplied = num_traits::FromPrimitive::from_i32(0).unwrap();
548+
let i32_zen: GeometricDelaysApplied = num_traits::FromPrimitive::from_i32(1).unwrap();
549+
let i32_tile: GeometricDelaysApplied = num_traits::FromPrimitive::from_i32(2).unwrap();
550+
let i32_azel: GeometricDelaysApplied = num_traits::FromPrimitive::from_i32(3).unwrap();
551551

552552
assert_eq!(i32_none, GeometricDelaysApplied::No);
553553
assert_eq!(i32_zen, GeometricDelaysApplied::Zenith);
554554
assert_eq!(i32_tile, GeometricDelaysApplied::TilePointing);
555555
assert_eq!(i32_azel, GeometricDelaysApplied::AzElTracking);
556556

557557
let geo_delay: GeometricDelaysApplied = match Some(1) {
558-
Some(g) => num::FromPrimitive::from_i32(g).unwrap(),
558+
Some(g) => num_traits::FromPrimitive::from_i32(g).unwrap(),
559559
None => GeometricDelaysApplied::No,
560560
};
561561
assert_eq!(geo_delay, GeometricDelaysApplied::Zenith);

0 commit comments

Comments
 (0)