diff --git a/CHANGES.md b/CHANGES.md index 5185809..2c1a464 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,8 @@ -v0.2.1 (dev) -============ + +v0.2.1 +====== + bump stream-vbyte for performance annotating ++ fix #43 where output vcf would have Number=, unless number was specified in config.json v0.2.0 ====== diff --git a/Cargo.toml b/Cargo.toml index fbd987d..c0ebd54 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "echtvar" -version = "0.2.0" +version = "0.2.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src/lib/fields.rs b/src/lib/fields.rs index 631dc70..c5b9509 100644 --- a/src/lib/fields.rs +++ b/src/lib/fields.rs @@ -1,7 +1,6 @@ use serde::{Deserialize, Serialize}; // 1.0.101 -#[derive(Debug, Deserialize, Serialize, PartialEq, PartialOrd, Clone)] -#[derive(Default)] +#[derive(Debug, Deserialize, Serialize, PartialEq, PartialOrd, Clone, Default)] pub enum FieldType { #[default] Integer, @@ -27,11 +26,9 @@ pub struct Field { pub multiplier: u32, #[serde(default)] pub ftype: FieldType, - #[serde(default)] + #[serde(default = "default_number")] pub number: std::string::String, - - #[serde(default = "default_values_i", skip_serializing)] pub values_i: usize, } @@ -39,6 +36,10 @@ pub struct Field { fn default_missing_value() -> i32 { -1 } + +fn default_number() -> std::string::String { + "1".to_string() +} fn default_missing_string() -> std::string::String { "MISSING".to_string() } @@ -69,8 +70,6 @@ impl Default for Field { } } - - #[cfg(test)] mod tests { use super::*;