vis_io -> io

And move the glob code in there too.

src/cli/di_calibrate/error.rs

@@ -80,7 +80,7 @@ pub(crate) enum DiCalArgsError {
     UnavailableTimestep { got: usize, last: usize },
 
     #[error(
-        "Cannot write visibilities to a file type '{ext}'. Supported formats are: {}", *crate::vis_io::write::VIS_OUTPUT_EXTENSIONS
+        "Cannot write visibilities to a file type '{ext}'. Supported formats are: {}", *crate::io::write::VIS_OUTPUT_EXTENSIONS
     )]
     VisFileType { ext: String },
 
@@ -91,7 +91,7 @@ pub(crate) enum DiCalArgsError {
     CalibrationOutputFile { ext: String },
 
     #[error(transparent)]
-    ParsePfbFlavour(#[from] crate::pfb_gains::PfbParseError),
+    ParsePfbFlavour(#[from] crate::io::read::pfb_gains::PfbParseError),
 
     #[error("Error when parsing time average factor: {0}")]
     ParseCalTimeAverageFactor(crate::unit_parsing::UnitParseError),
@@ -151,13 +151,13 @@ pub(crate) enum DiCalArgsError {
     BadArrayPosition { pos: Vec<f64> },
 
     #[error(transparent)]
-    Glob(#[from] crate::glob::GlobError),
+    Glob(#[from] crate::io::GlobError),
 
     #[error(transparent)]
-    VisRead(#[from] crate::vis_io::read::VisReadError),
+    VisRead(#[from] crate::io::read::VisReadError),
 
     #[error(transparent)]
-    FileWrite(#[from] crate::vis_io::write::FileWriteError),
+    FileWrite(#[from] crate::io::write::FileWriteError),
 
     #[error(transparent)]
     Veto(#[from] crate::srclist::VetoError),

src/cli/di_calibrate/mod.rs

@@ -33,9 +33,9 @@ use strum_macros::{Display, EnumIter, EnumString};
 use crate::{
     di_calibrate::DiCalibrateError,
     help_texts::*,
+    io::write::VIS_OUTPUT_EXTENSIONS,
     solutions::{self, CalSolutionType, CalibrationSolutions, CAL_SOLUTION_EXTENSIONS},
     unit_parsing::WAVELENGTH_FORMATS,
-    vis_io::write::VIS_OUTPUT_EXTENSIONS,
     HyperdriveError,
 };
 

src/cli/di_calibrate/params.rs

@@ -28,20 +28,20 @@ use crate::{
     context::ObsContext,
     di_calibrate::{calibrate_timeblocks, get_cal_vis, CalVis},
     filenames::InputDataTypes,
-    glob::*,
-    math::TileBaselineFlags,
-    messages,
-    model::ModellerInfo,
-    solutions::{CalSolutionType, CalibrationSolutions},
-    srclist::{read::read_source_list_file, veto_sources, SourceList, SourceListType},
-    unit_parsing::{parse_wavelength, WavelengthUnit},
-    vis_io::{
+    io::{
+        get_single_match_from_glob,
         read::{
             MsReader, RawDataCorrections, RawDataReader, UvfitsReader, VisInputType, VisRead,
             VisReadError,
         },
         write::{can_write_to_file, VisOutputType},
     },
+    math::TileBaselineFlags,
+    messages,
+    model::ModellerInfo,
+    solutions::{CalSolutionType, CalibrationSolutions},
+    srclist::{read::read_source_list_file, veto_sources, SourceList, SourceListType},
+    unit_parsing::{parse_wavelength, WavelengthUnit},
 };
 
 /// Parameters needed to perform calibration.

src/cli/solutions/apply/error.rs

@@ -7,7 +7,7 @@ use std::path::PathBuf;
 use thiserror::Error;
 use vec1::Vec1;
 
-use crate::{filenames::SUPPORTED_INPUT_FILE_COMBINATIONS, vis_io::write::VIS_OUTPUT_EXTENSIONS};
+use crate::{filenames::SUPPORTED_INPUT_FILE_COMBINATIONS, io::write::VIS_OUTPUT_EXTENSIONS};
 
 #[derive(Error, Debug)]
 pub(crate) enum SolutionsApplyError {
@@ -57,7 +57,7 @@ pub(crate) enum SolutionsApplyError {
     BadArrayPosition { pos: Vec<f64> },
 
     #[error(transparent)]
-    ParsePfbFlavour(#[from] crate::pfb_gains::PfbParseError),
+    ParsePfbFlavour(#[from] crate::io::read::pfb_gains::PfbParseError),
 
     #[error("Error when parsing output vis. time average factor: {0}")]
     ParseOutputVisTimeAverageFactor(crate::unit_parsing::UnitParseError),
@@ -87,13 +87,13 @@ pub(crate) enum SolutionsApplyError {
     SolutionsRead(#[from] crate::solutions::SolutionsReadError),
 
     #[error(transparent)]
-    VisRead(#[from] crate::vis_io::read::VisReadError),
+    VisRead(#[from] crate::io::read::VisReadError),
 
     #[error(transparent)]
-    FileWrite(#[from] crate::vis_io::write::FileWriteError),
+    FileWrite(#[from] crate::io::write::FileWriteError),
 
     #[error(transparent)]
-    VisWrite(#[from] crate::vis_io::write::VisWriteError),
+    VisWrite(#[from] crate::io::write::VisWriteError),
 
     #[error(transparent)]
     IO(#[from] std::io::Error),

src/cli/solutions/apply/mod.rs

@@ -33,14 +33,15 @@ use crate::{
     context::ObsContext,
     filenames::InputDataTypes,
     help_texts::ARRAY_POSITION_HELP,
+    io::{
+        read::{
+            pfb_gains::PfbFlavour, MsReader, RawDataReader, UvfitsReader, VisInputType, VisRead,
+        },
+        write::{can_write_to_file, write_vis, VisOutputType, VisTimestep, VIS_OUTPUT_EXTENSIONS},
+    },
     math::TileBaselineFlags,
     messages,
-    pfb_gains::PfbFlavour,
     solutions::CalibrationSolutions,
-    vis_io::{
-        read::{MsReader, RawDataReader, UvfitsReader, VisInputType, VisRead},
-        write::{can_write_to_file, write_vis, VisOutputType, VisTimestep, VIS_OUTPUT_EXTENSIONS},
-    },
     HyperdriveError,
 };
 

src/cli/solutions/apply/tests.rs

@@ -18,11 +18,10 @@ use vec1::vec1;
 
 use super::*;
 use crate::{
-    pfb_gains::PfbFlavour,
+    io::read::{pfb_gains::PfbFlavour, RawDataCorrections},
     tests::reduced_obsids::{
         get_reduced_1090008640, get_reduced_1090008640_ms, get_reduced_1090008640_uvfits,
     },
-    vis_io::read::RawDataCorrections,
 };
 
 fn test_solutions_apply_trivial(input_data: &dyn VisRead, metafits: &str) {

src/cli/vis_utils/simulate/error.rs

@@ -8,7 +8,7 @@ use std::path::PathBuf;
 
 use thiserror::Error;
 
-use crate::vis_io::write::VIS_OUTPUT_EXTENSIONS;
+use crate::io::write::VIS_OUTPUT_EXTENSIONS;
 
 #[derive(Error, Debug)]
 pub(crate) enum VisSimulateError {
@@ -48,7 +48,7 @@ pub(crate) enum VisSimulateError {
     NoSourcesAfterVeto,
 
     #[error(transparent)]
-    FileWrite(#[from] crate::vis_io::write::FileWriteError),
+    FileWrite(#[from] crate::io::write::FileWriteError),
 
     #[error(transparent)]
     AverageFactor(#[from] crate::averaging::AverageFactorError),
@@ -63,10 +63,10 @@ pub(crate) enum VisSimulateError {
     Beam(#[from] crate::beam::BeamError),
 
     #[error(transparent)]
-    VisWrite(#[from] crate::vis_io::write::VisWriteError),
+    VisWrite(#[from] crate::io::write::VisWriteError),
 
     #[error(transparent)]
-    Glob(#[from] crate::glob::GlobError),
+    Glob(#[from] crate::io::GlobError),
 
     #[error(transparent)]
     Mwalib(#[from] mwalib::MwalibError),

src/cli/vis_utils/simulate/mod.rs

@@ -31,18 +31,18 @@ use crate::{
     averaging::{parse_freq_average_factor, parse_time_average_factor, timesteps_to_timeblocks},
     beam::{create_fee_beam_object, create_no_beam_object, Beam, Delays},
     constants::{DEFAULT_CUTOFF_DISTANCE, DEFAULT_VETO_THRESHOLD},
-    glob::get_single_match_from_glob,
     help_texts::{
         ARRAY_POSITION_HELP, DIPOLE_DELAYS_HELP, SOURCE_DIST_CUTOFF_HELP, VETO_THRESHOLD_HELP,
     },
+    io::{
+        get_single_match_from_glob,
+        write::{can_write_to_file, write_vis, VisOutputType, VisTimestep, VIS_OUTPUT_EXTENSIONS},
+    },
     math::TileBaselineFlags,
     messages,
     metafits::{get_dipole_delays, get_dipole_gains},
     model::{self, ModellerInfo, SkyModeller},
     srclist::{read::read_source_list_file, veto_sources, ComponentCounts, SourceList},
-    vis_io::write::{
-        can_write_to_file, write_vis, VisOutputType, VisTimestep, VIS_OUTPUT_EXTENSIONS,
-    },
     HyperdriveError,
 };
 

src/cli/vis_utils/subtract/error.rs

@@ -10,7 +10,7 @@ use thiserror::Error;
 use vec1::Vec1;
 
 use crate::{
-    filenames::SUPPORTED_CALIBRATED_INPUT_FILE_COMBINATIONS, vis_io::write::VIS_OUTPUT_EXTENSIONS,
+    filenames::SUPPORTED_CALIBRATED_INPUT_FILE_COMBINATIONS, io::write::VIS_OUTPUT_EXTENSIONS,
 };
 
 #[derive(Error, Debug)]
@@ -98,16 +98,16 @@ pub(crate) enum VisSubtractError {
     Veto(#[from] crate::srclist::VetoError),
 
     #[error(transparent)]
-    VisRead(#[from] crate::vis_io::read::VisReadError),
+    VisRead(#[from] crate::io::read::VisReadError),
 
     #[error(transparent)]
-    Glob(#[from] crate::glob::GlobError),
+    Glob(#[from] crate::io::GlobError),
 
     #[error(transparent)]
-    VisWrite(#[from] crate::vis_io::write::VisWriteError),
+    VisWrite(#[from] crate::io::write::VisWriteError),
 
     #[error(transparent)]
-    FileWrite(#[from] crate::vis_io::write::FileWriteError),
+    FileWrite(#[from] crate::io::write::FileWriteError),
 
     #[error(transparent)]
     SourceList(#[from] crate::srclist::ReadSourceListError),

src/cli/vis_utils/subtract/mod.rs

@@ -34,19 +34,19 @@ use crate::{
     constants::{DEFAULT_CUTOFF_DISTANCE, DEFAULT_VETO_THRESHOLD},
     context::ObsContext,
     filenames::InputDataTypes,
-    glob::*,
     help_texts::{
         ARRAY_POSITION_HELP, DIPOLE_DELAYS_HELP, SOURCE_DIST_CUTOFF_HELP as sdc_help,
         SOURCE_LIST_TYPE_HELP, VETO_THRESHOLD_HELP as vt_help,
     },
+    io::{
+        get_single_match_from_glob,
+        read::{MsReader, UvfitsReader, VisInputType, VisRead},
+        write::{can_write_to_file, write_vis, VisOutputType, VisTimestep, VIS_OUTPUT_EXTENSIONS},
+    },
     math::TileBaselineFlags,
     messages,
     model::ModellerInfo,
     srclist::{read::read_source_list_file, veto_sources, SourceList, SourceListType},
-    vis_io::{
-        read::{MsReader, UvfitsReader, VisInputType, VisRead},
-        write::{can_write_to_file, write_vis, VisOutputType, VisTimestep, VIS_OUTPUT_EXTENSIONS},
-    },
     HyperdriveError,
 };
 

src/di_calibrate/error.rs

@@ -29,10 +29,10 @@ pub(crate) enum DiCalibrateError {
     Model(#[from] crate::model::ModelError),
 
     #[error(transparent)]
-    VisRead(#[from] crate::vis_io::read::VisReadError),
+    VisRead(#[from] crate::io::read::VisReadError),
 
     #[error(transparent)]
-    VisWrite(#[from] crate::vis_io::write::VisWriteError),
+    VisWrite(#[from] crate::io::write::VisWriteError),
 
     #[error(transparent)]
     Fitsio(#[from] fitsio::errors::Error),

src/di_calibrate/mod.rs

@@ -35,10 +35,10 @@ use vec1::Vec1;
 use crate::{
     averaging::{timesteps_to_timeblocks, Chanblock, Timeblock},
     cli::di_calibrate::DiCalParams,
+    io::write::{write_vis, VisTimestep},
     math::average_epoch,
     model::{self, ModellerInfo},
     solutions::CalibrationSolutions,
-    vis_io::write::{write_vis, VisTimestep},
 };
 
 pub(crate) struct CalVis {

src/di_calibrate/tests.rs

@@ -32,11 +32,11 @@ use crate::{
     beam::create_no_beam_object,
     cli::di_calibrate::DiCalParams,
     di_calibrate::calibrate_timeblock,
+    io::read::{MsReader, RawDataCorrections, RawDataReader, VisRead},
     math::{is_prime, TileBaselineFlags},
     solutions::CalSolutionType,
     srclist::SourceList,
     tests::reduced_obsids::get_reduced_1090008640,
-    vis_io::read::{MsReader, RawDataCorrections, RawDataReader, VisRead},
     CalibrationSolutions, DiCalArgs, VisSimulateArgs,
 };
 

src/error.rs

@@ -15,9 +15,9 @@ use crate::{
     },
     di_calibrate::DiCalibrateError,
     filenames::InputFileError,
+    io::read::VisReadError,
     solutions::{SolutionsReadError, SolutionsWriteError},
     srclist::SrclistError,
-    vis_io::read::VisReadError,
 };
 
 const URL: &str = "https://MWATelescope.github.io/mwa_hyperdrive";

src/filenames.rs

@@ -15,8 +15,7 @@ use regex::{Regex, RegexBuilder};
 use thiserror::Error;
 use vec1::Vec1;
 
-use crate::glob::{get_all_matches_from_glob, GlobError};
-use crate::vis_io::read::VisReadError;
+use crate::io::{get_all_matches_from_glob, read::VisReadError, GlobError};
 
 lazy_static::lazy_static! {
     // gpubox files should not be renamed in any way! This includes the case of

src/help_texts.rs

@@ -8,7 +8,7 @@ use crate::{
     constants::{
         DEFAULT_CUTOFF_DISTANCE, DEFAULT_VETO_THRESHOLD, MWA_HEIGHT_M, MWA_LAT_DEG, MWA_LONG_DEG,
     },
-    pfb_gains::{DEFAULT_PFB_FLAVOUR, PFB_FLAVOURS},
+    io::read::pfb_gains::{DEFAULT_PFB_FLAVOUR, PFB_FLAVOURS},
     srclist::SOURCE_LIST_TYPES_COMMA_SEPARATED,
 };
 

src/glob/mod.rs → src/io/glob.rs

@@ -71,10 +71,10 @@ mod tests {
         let result = get_single_match_from_glob("./Cargo*");
         assert!(result.is_err());
 
-        let result = get_single_match_from_glob("src/vis_io/write/mod*");
+        let result = get_single_match_from_glob("src/io/write/mod*");
         assert!(result.is_ok(), "{:?}", result.err().unwrap());
         let entry = result.unwrap();
-        assert_eq!(entry, PathBuf::from("src/vis_io/write/mod.rs"));
+        assert_eq!(entry, PathBuf::from("src/io/write/mod.rs"));
 
         let glob = "Cargo.t*l";
         assert_eq!(

src/vis_io/mod.rs → src/io/mod.rs

@@ -2,7 +2,11 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-//! Visibilities input/output (reading and writing).
+//! File stuff (input/output, reading/writing, globs), for visibilities and
+//! others.
 
+mod glob;
 pub(crate) mod read;
 pub(crate) mod write;
+
+pub(crate) use self::glob::{get_all_matches_from_glob, get_single_match_from_glob, GlobError};

src/vis_io/read/mod.rs → src/io/read/mod.rs

@@ -11,7 +11,7 @@ mod uvfits;
 
 pub(crate) use error::VisReadError;
 pub(crate) use ms::MsReader;
-pub(crate) use raw::{RawDataCorrections, RawDataReader};
+pub(crate) use raw::{pfb_gains, RawDataCorrections, RawDataReader};
 pub(crate) use uvfits::UvfitsReader;
 
 use std::collections::HashSet;

src/vis_io/read/ms/error.rs → src/io/read/ms/error.rs

@@ -68,7 +68,7 @@ pub(crate) enum MsReadError {
     Casacore(#[from] rubbl_casatables::CasacoreError),
 
     #[error(transparent)]
-    Glob(#[from] crate::glob::GlobError),
+    Glob(#[from] crate::io::GlobError),
 
     #[error(transparent)]
     Mwalib(#[from] mwalib::MwalibError),

src/vis_io/read/raw/error.rs → src/io/read/raw/error.rs

@@ -32,7 +32,7 @@ pub(crate) enum RawReadError {
     MwafMerge(#[from] MwafMergeError),
 
     #[error(transparent)]
-    Glob(#[from] crate::glob::GlobError),
+    Glob(#[from] crate::io::GlobError),
 
     #[error("mwalib error: {0}")]
     Mwalib(#[from] mwalib::MwalibError),