Skip to content

Commit

Permalink
fix: test on thermo feature instead of dependency (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
@paretje
paretje authored Sep 23, 2024
1 parent a76c4dd commit 668af44
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions src/io.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ pub use crate::io::traits::{
pub use crate::io::utils::{checksum_file, DetailLevel, PreBufferedStream};
pub use compression::RestartableGzDecoder;

#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
pub mod thermo;
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
pub use thermo::ThermoRawReader;

pub mod usi;
pub mod proxi;
pub mod proxi;
24 changes: 12 additions & 12 deletions src/io/infer_format.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ use crate::spectrum::bindata::{BuildArrayMapFrom, BuildFromArrayMap};
use crate::spectrum::MultiLayerSpectrum;
use crate::Param;

#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
use super::thermo::{ThermoRawReaderType, is_thermo_raw_prefix};

use super::traits::{ChromatogramSource, SeekRead, SpectrumReceiver, StreamingSpectrumIterator};
Expand Down Expand Up @@ -115,7 +115,7 @@ pub enum MZReaderType<
D: DeconvolutedCentroidLike + Default + From<DeconvolutedPeak> + BuildFromArrayMap=DeconvolutedPeak> {
MzML(MzMLReaderType<R, C, D>),
MGF(MGFReaderType<R, C, D>),
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
ThermoRaw(ThermoRawReaderType<C, D>),
#[cfg(feature = "mzmlb")]
MzMLb(MzMLbReaderType<C, D>)
Expand Down Expand Up @@ -204,7 +204,7 @@ macro_rules! msfmt_dispatch {
match $d {
MZReaderType::MzML($r) => $e,
MZReaderType::MGF($r) => $e,
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MZReaderType::ThermoRaw($r) => $e,
#[cfg(feature = "mzmlb")]
MZReaderType::MzMLb($r) => $e,
Expand All @@ -230,7 +230,7 @@ impl<R: io::Read + io::Seek,
match &self {
MZReaderType::MzML(_) => MassSpectrometryFormat::MzML,
MZReaderType::MGF(_) => MassSpectrometryFormat::MGF,
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MZReaderType::ThermoRaw(_) => MassSpectrometryFormat::ThermoRaw,
#[cfg(feature = "mzmlb")]
MZReaderType::MzMLb(_) => MassSpectrometryFormat::MzMLb,
Expand Down Expand Up @@ -287,7 +287,7 @@ impl<R: io::Read + io::Seek,
match self {
MZReaderType::MzML(r) => r.get_chromatogram_by_id(id),
MZReaderType::MGF(r) => r.get_chromatogram_by_id(id),
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MZReaderType::ThermoRaw(r) => r.get_chromatogram_by_id(id),
#[cfg(feature = "mzmlb")]
MZReaderType::MzMLb(r) => r.get_chromatogram_by_id(id),
Expand All @@ -298,7 +298,7 @@ impl<R: io::Read + io::Seek,
match self {
MZReaderType::MzML(r) => r.get_chromatogram_by_index(index),
MZReaderType::MGF(r) => r.get_chromatogram_by_index(index),
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MZReaderType::ThermoRaw(r) => r.get_chromatogram_by_index(index),
#[cfg(feature = "mzmlb")]
MZReaderType::MzMLb(r) => r.get_chromatogram_by_index(index),
Expand Down Expand Up @@ -391,7 +391,7 @@ impl<C: CentroidLike + Default + From<CentroidPeak> + BuildFromArrayMap,
let reader = MzMLReaderType::open_path(path)?;
Ok(Self::MzML(reader))
}
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MassSpectrometryFormat::ThermoRaw => {
let reader = ThermoRawReaderType::open_path(path)?;
Ok(Self::ThermoRaw(reader))
Expand Down Expand Up @@ -427,7 +427,7 @@ impl<C: CentroidLike + Default + From<CentroidPeak> + BuildFromArrayMap,
let reader = MzMLReaderType::open_file(source)?;
Ok(Self::MzML(reader))
}
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MassSpectrometryFormat::ThermoRaw => {
let reader = ThermoRawReaderType::open_file(source)?;
Ok(Self::ThermoRaw(reader))
Expand Down Expand Up @@ -535,7 +535,7 @@ macro_rules! msfmt_dispatch_cap {
MZReaderType::MGF($r) => {
$e?;
},
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MZReaderType::ThermoRaw($r) => {
$e?;
},
Expand Down Expand Up @@ -578,7 +578,7 @@ pub fn infer_from_path<P: Into<path::PathBuf>>(path: P) -> (MassSpectrometryForm
"mgf" => MassSpectrometryFormat::MGF,
#[cfg(feature = "mzmlb")]
"mzmlb" => MassSpectrometryFormat::MzMLb,
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
"raw" => MassSpectrometryFormat::ThermoRaw,
_ => MassSpectrometryFormat::Unknown,
};
Expand Down Expand Up @@ -621,7 +621,7 @@ pub fn infer_from_stream<R: Read + Seek>(
match &buf {
_ if is_mzml(&buf) => Ok((MassSpectrometryFormat::MzML, is_stream_gzipped)),
_ if is_mgf(&buf) => Ok((MassSpectrometryFormat::MGF, is_stream_gzipped)),
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
_ if is_thermo_raw_prefix(&buf) => Ok((MassSpectrometryFormat::ThermoRaw, is_stream_gzipped)),
_ => Ok((MassSpectrometryFormat::Unknown, is_stream_gzipped))
}
Expand Down Expand Up @@ -907,7 +907,7 @@ pub trait MassSpectrometryReadWriteProcess<
self.open_writer(reader, format, write_path)?;
Ok(())
},
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
MassSpectrometryFormat::ThermoRaw => {
let reader = ThermoRawReaderType::new(&read_path)?;
let reader = self.transform_reader(reader, format)?;
Expand Down
2 changes: 1 addition & 1 deletion src/io/shorthand.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ macro_rules! mz_read {
let mut $reader: $crate::io::mzmlb::MzMLbReaderType<$C, $D> = $crate::io::mzmlb::MzMLbReaderType::<$C, $D>::new(&read_path)?;
Ok($impl)
},
#[cfg(feature = "thermorawfilereader")]
#[cfg(feature = "thermo")]
$crate::io::MassSpectrometryFormat::ThermoRaw => {
#[allow(unused_mut)]
let mut $reader: $crate::io::thermo::ThermoRawReaderType<$C, $D> = $crate::io::thermo::ThermoRawReaderType::<$C, $D>::new(&read_path)?;
Expand Down

0 comments on commit 668af44

Please sign in to comment.