From e4b25b995b631656ddcb684fd115479f3f4d7518 Mon Sep 17 00:00:00 2001 From: d3v-null Date: Thu, 27 Jun 2024 02:34:50 +0000 Subject: [PATCH] release 0.12.0 - replaces 0.11.1 which was semver incompatible - linter fixes --- Cargo.lock | 2 +- Cargo.toml | 2 +- RELEASES.md | 2 +- src/cli.rs | 17 ++++++++++------- src/preprocessing.rs | 2 +- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 475f155..244bca7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -116,7 +116,7 @@ dependencies = [ [[package]] name = "birli" -version = "0.11.1" +version = "0.12.0" dependencies = [ "aoflagger_sys", "approx", diff --git a/Cargo.toml b/Cargo.toml index 1e318be..6640785 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "birli" description = "A preprocessing pipeline for the Murchison Widefield Array" -version = "0.11.1" +version = "0.12.0" readme = "README.md" homepage = "https://github.com/MWATelescope/Birli" repository = "https://github.com/MWATelescope/Birli" diff --git a/RELEASES.md b/RELEASES.md index 6fd1fa0..1419d95 100644 --- a/RELEASES.md +++ b/RELEASES.md @@ -1,6 +1,6 @@ -# Version 0.11.1 (2024-06-27) +# Version 0.12.0 (2024-06-27) - 🐛 bug fixes: - #152 default pfb gains should be cotter2014 for legacy correlator, not jake - 🙏 quality of life: diff --git a/src/cli.rs b/src/cli.rs index 9843409..4855011 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -50,7 +50,7 @@ cfg_if! { /// Args for preprocessing a correlator context. pub struct BirliContext<'a> { - /// mwalib::CorrelatorContext + /// `mwalib::CorrelatorContext` pub corr_ctx: CorrelatorContext, /// Preprocessing parameters pub prep_ctx: PreprocessContext<'a>, @@ -1121,8 +1121,9 @@ impl<'a> BirliContext<'a> { matches.value_of_t::("avg-time-res"), ) { // filter any errors other than ArgumentNotFound - (Err(err), _) if err.kind() != ArgumentNotFound => return Err(err.into()), - (_, Err(err)) if err.kind() != ArgumentNotFound => return Err(err.into()), + (Err(err), _) | (_, Err(err)) if err.kind() != ArgumentNotFound => { + return Err(err.into()) + } (Ok(_), Ok(_)) => { unreachable!("--avg-time-res conflicts with --avg-time-factor, enforced by clap") } @@ -1155,8 +1156,9 @@ impl<'a> BirliContext<'a> { matches.value_of_t::("avg-freq-res"), ) { // filter any errors other than ArgumentNotFound - (Err(err), _) if err.kind() != ArgumentNotFound => return Err(err.into()), - (_, Err(err)) if err.kind() != ArgumentNotFound => return Err(err.into()), + (Err(err), _) | (_, Err(err)) if err.kind() != ArgumentNotFound => { + return Err(err.into()) + } (Ok(_), Ok(_)) => { unreachable!("--avg-freq-res conflicts with --avg-freq-factor, enforced by clap") } @@ -1202,8 +1204,9 @@ impl<'a> BirliContext<'a> { matches.value_of_t::("max-memory"), ) { // filter any errors other than ArgumentNotFound - (Err(err), _) if err.kind() != ArgumentNotFound => return Err(err.into()), - (_, Err(err)) if err.kind() != ArgumentNotFound => return Err(err.into()), + (Err(err), _) | (_, Err(err)) if err.kind() != ArgumentNotFound => { + return Err(err.into()) + } (Ok(_), Ok(_)) => { unreachable!("--time-chunk conflicts with --max-memory, enforced by clap") } diff --git a/src/preprocessing.rs b/src/preprocessing.rs index 9d2d988..afcdad2 100644 --- a/src/preprocessing.rs +++ b/src/preprocessing.rs @@ -45,7 +45,7 @@ pub struct PreprocessContext<'a> { #[builder(default = "true")] pub correct_geometry: bool, - /// AOFlagger strategy path for flagging + /// `AOFlagger` strategy path for flagging #[builder(default)] #[cfg(feature = "aoflagger")] pub aoflagger_strategy: Option,