Rename spectrum::signal to spectrum::bindata

src/io/mgf.rs

@@ -33,7 +33,7 @@ use crate::meta::{
     DataProcessing, FileDescription, InstrumentConfiguration, MSDataFileMetadata, Software,
 };
 use crate::params::{ControlledVocabulary, Param, ParamDescribed, ParamLike};
-use crate::spectrum::signal::{
+use crate::spectrum::bindata::{
     vec_as_bytes, ArrayType, BinaryArrayMap, BinaryDataArrayType, BuildArrayMapFrom,
     BuildFromArrayMap, DataArray,
 };

src/io/mzml/reader.rs

@@ -29,10 +29,9 @@ use crate::meta::InstrumentConfiguration;
 use crate::meta::{DataProcessing, MSDataFileMetadata, Software};
 use crate::params::{Param, ParamList, Unit};
 use crate::spectrum::scan_properties::*;
-use crate::spectrum::signal::BuildArrayMapFrom;
-use crate::spectrum::signal::BuildFromArrayMap;
-use crate::spectrum::signal::{
+use crate::spectrum::bindata::{
     ArrayType, BinaryArrayMap, BinaryCompressionType, BinaryDataArrayType, DataArray,
+    BuildFromArrayMap, BuildArrayMapFrom
 };
 use crate::spectrum::spectrum::{
     CentroidPeakAdapting, CentroidSpectrumType, DeconvolutedPeakAdapting, MultiLayerSpectrum,

src/io/mzml/writer.rs

@@ -24,7 +24,7 @@ use crate::meta::{
     Software,
 };
 use crate::params::{ControlledVocabulary, Param, ParamCow, ParamDescribed, ParamLike, Unit};
-use crate::spectrum::signal::{
+use crate::spectrum::bindata::{
     to_bytes, ArrayRetrievalError, ArrayType, BinaryArrayMap, BinaryCompressionType,
     BinaryDataArrayType, BuildArrayMapFrom, ByteArrayView, DataArray,
 };

src/io/mzmlb/reader.rs

@@ -27,7 +27,7 @@ use crate::prelude::{MSDataFileMetadata, ParamLike};
 
 use crate::meta::{DataProcessing, FileDescription, InstrumentConfiguration, Software};
 use crate::params::{ControlledVocabulary, Param};
-use crate::spectrum::signal::{
+use crate::spectrum::bindata::{
     as_bytes, delta_decoding, linear_prediction_decoding, ArrayRetrievalError,
     BinaryCompressionType, BinaryDataArrayType, ByteArrayView, ByteArrayViewMut, DataArray,
 };

src/io/mzmlb/writer.rs

@@ -29,7 +29,7 @@ use crate::prelude::MSDataFileMetadata;
 use crate::io::traits::ScanWriter;
 use crate::meta::{DataProcessing, FileDescription, InstrumentConfiguration, Software};
 use crate::params::ControlledVocabulary;
-use crate::spectrum::signal::{
+use crate::spectrum::bindata::{
     ArrayRetrievalError, BinaryDataArrayType, BuildArrayMapFrom, ByteArrayView, DataArray,
 };
 use crate::spectrum::{

src/meta/data_processing.rs

@@ -1,3 +1,4 @@
+#![allow(unused)]
 use std::fmt::Display;
 
 use crate::impl_param_described;

src/prelude.rs

@@ -5,6 +5,6 @@ pub use crate::io::traits::{
 pub use crate::meta::MSDataFileMetadata;
 pub use crate::params::{ParamDescribed, ParamLike};
 pub use crate::spectrum::{IonProperties, PrecursorSelection, SpectrumLike};
-pub use crate::spectrum::signal::{ByteArrayView, ByteArrayViewMut, BuildArrayMapFrom, BuildFromArrayMap};
+pub use crate::spectrum::bindata::{ByteArrayView, ByteArrayViewMut, BuildArrayMapFrom, BuildFromArrayMap};
 pub use std::convert::TryInto;
 pub use std::io::prelude::*;

src/spectrum.rs

@@ -52,12 +52,12 @@ for spectrum in reader {
 */
 
 pub(crate) mod scan_properties;
-pub mod signal;
+pub mod bindata;
 pub(crate) mod spectrum;
 pub(crate) mod chromatogram;
 
 pub use crate::spectrum::scan_properties::*;
-pub use crate::spectrum::signal::{ArrayType, BinaryArrayMap, BinaryDataArrayType, DataArray};
+pub use crate::spectrum::bindata::{ArrayType, BinaryArrayMap, BinaryDataArrayType, DataArray};
 pub use crate::spectrum::spectrum::{
     SpectrumLike, PeakDataLevel,
     SpectrumConversionError, SpectrumProcessingError,

src/spectrum/signal.rs → src/spectrum/bindata.rs

@@ -1,10 +1,10 @@
-mod bindata;
+mod array;
 mod conversion;
 mod encodings;
 mod map;
 mod traits;
 
-pub use bindata::{DataArray, DataArraySlice};
+pub use array::{DataArray, DataArraySlice};
 pub use encodings::{
     as_bytes, delta_decoding, delta_encoding, linear_prediction_decoding,
     linear_prediction_encoding, to_bytes, vec_as_bytes, ArrayRetrievalError, ArrayType,

src/spectrum/signal/conversion.rs → src/spectrum/bindata/conversion.rs

@@ -7,7 +7,7 @@ use mzpeaks::{
 
 use crate::utils::neutral_mass;
 
-use super::bindata::DataArray;
+use super::array::DataArray;
 use super::encodings::{
     ArrayRetrievalError, ArrayType, BinaryCompressionType, BinaryDataArrayType,
 };

src/spectrum/signal/map.rs → src/spectrum/bindata/map.rs

@@ -8,7 +8,7 @@ use rayon::prelude::*;
 
 use mzpeaks::Tolerance;
 
-use super::bindata::DataArray;
+use super::array::DataArray;
 use super::encodings::{ArrayType, ArrayRetrievalError, BinaryCompressionType};
 use super::traits::{ByteArrayView, ByteArrayViewMut};
 

src/spectrum/chromatogram.rs

@@ -4,7 +4,7 @@ use crate::params::Param;
 use crate::spectrum::scan_properties::{
     Precursor, ScanPolarity, ChromatogramType, ChromatogramDescription,
 };
-use super::signal::{ArrayType, BinaryArrayMap, ArrayRetrievalError, ByteArrayView};
+use super::bindata::{ArrayType, BinaryArrayMap, ArrayRetrievalError, ByteArrayView};
 
 
 

src/spectrum/spectrum.rs

@@ -59,9 +59,9 @@ use crate::params::ParamList;
 use crate::spectrum::scan_properties::{
     Acquisition, Precursor, ScanPolarity, SignalContinuity, SpectrumDescription,
 };
-use crate::spectrum::signal::{ArrayType, BinaryArrayMap, BinaryDataArrayType};
+use crate::spectrum::bindata::{ArrayType, BinaryArrayMap, BinaryDataArrayType};
 
-use super::signal::{ArrayRetrievalError, BuildArrayMapFrom, BuildFromArrayMap};
+use super::bindata::{ArrayRetrievalError, BuildArrayMapFrom, BuildFromArrayMap};
 
 pub trait CentroidPeakAdapting: CentroidLike + Default {}
 impl<C: CentroidLike + Default> CentroidPeakAdapting for C {}