{"header":{"message":"packlist: less normalization to support proper roundtrips (which only truncate trailing spaces)","description":null,"timestamp":"2021-09-21T11:32:12.470736752Z","authors":[{}]},"hash":"VHLGEBT74I5RXLGUWMVCXM64BYG7HOOFT7SURJ5TCTB3AAOQHIKQC","authors":[{"login":"fogti","key":"mQomBKsugf4JAHNPzJ3wTU2mZ3UbLxyWmiDrmq4Syqg"}],"deps":{"hashes":[["VHLGEBT74I5RXLGUWMVCXM64BYG7HOOFT7SURJ5TCTB3AAOQHIKQC","packlist: less normalization to support proper roundtrips (which only truncate trailing spaces)"],["AA",null],["NAZOIBERE343KHGKHEAQ6DNQFVDWCA7TPAHUR6TCJB5BRHTQPE3QC","packlist: fix crash on empty input"],["JWYGE7FX2NKJEDVDP22JW4NH2VYHPM637MOKFWAAAMN3FRB3D25AC","packlist : +reset utility"],["V4EAN7NNXKHQFA3HDHRREMWNWRB3XSHIOTE2G4VLHTRMTFD7NP4QC","move some stuff around; more packlist stuff"],["7WMS7RLPXYF47WXLZXY25VCUJOGL7XIDVQK6FGT27EHPG2JICDRQC","packlist: add support for parsing of multiple premarkers per item"],["BUI22CYQ7XPD64JNBPOQZJMO5KDXSTFWPT3CXLOGL5EHVTO63SMAC","+zhed-packlist"]],"deps":["NAZOIBERE343KHGKHEAQ6DNQFVDWCA7TPAHUR6TCJB5BRHTQPE3QC","JWYGE7FX2NKJEDVDP22JW4NH2VYHPM637MOKFWAAAMN3FRB3D25AC"],"known":["BUI22CYQ7XPD64JNBPOQZJMO5KDXSTFWPT3CXLOGL5EHVTO63SMAC","V4EAN7NNXKHQFA3HDHRREMWNWRB3XSHIOTE2G4VLHTRMTFD7NP4QC","7WMS7RLPXYF47WXLZXY25VCUJOGL7XIDVQK6FGT27EHPG2JICDRQC"]},"hunks":[{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":1,"ins":{"up_context":[{"change":4,"pos":34}],"down_context":[{"change":4,"pos":116}],"flag":"BLOCK","start":0,"end":106,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34},"to":{"change":4,"start":0,"end":42},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":42},"to":{"change":4,"start":35,"end":74},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":34},"to":{"change":4,"start":35,"end":74},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"use crate::{Item, ItemDetails, PackList, Spaced};"},{"Add":"use alloc::{string::ToString, vec::Vec};"},{"Add":"use core::fmt;"}],"del_contents":[{"Del":"use crate::{ItemData, PackList, Section};\n"},{"Del":"use std::{collections::BTreeMap, fmt};\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":5,"ins":{"up_context":[{"change":4,"pos":117}],"down_context":[{"change":4,"pos":167}],"flag":"BLOCK","start":107,"end":194,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":117},"to":{"change":4,"start":117,"end":167},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"#[derive(Debug, PartialEq, Eq)]"},{"Add":"#[cfg_attr(feature = \"std\", derive(thiserror::Error))]"}],"del_contents":[{"Del":"#[derive(thiserror::Error, Debug, PartialEq, Eq)]\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":8,"ins":{"up_context":[{"change":4,"pos":184}],"down_context":[{"change":2,"pos":31}],"flag":"BLOCK","start":195,"end":404,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":184},"to":{"change":4,"start":184,"end":417},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":417},"to":{"change":2,"start":0,"end":31},"introduced_by":2}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" /// ```"},{"Add":" /// use zhed_packlist::{PackList, ParseError};"},{"Add":" /// assert_eq!(\"\".parse::(), Err(ParseError::UnexpectedEof));"},{"Add":" /// ```"},{"Add":" #[cfg_attr(feature = \"std\", error(\"unexpected EOF\"))]"}],"del_contents":[{"Del":" #[error(\"unexpected data after range specification in header\")]\n DataAfterRangeSpec,\n #[error(\"section is defined multiple times\")]\n SectionOverwritten(String),\n #[error(\"invalid item: {0}\")]\n InvalidItem(String),\n"},{"Del":" #[error(\"unexpected EOF\")]\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":16,"ins":{"up_context":[{"change":4,"pos":420}],"down_context":[{"change":4,"pos":458}],"flag":"BLOCK","start":405,"end":444,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":420},"to":{"change":4,"start":420,"end":458},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"impl core::str::FromStr for PackList {"}],"del_contents":[{"Del":"impl std::str::FromStr for PackList {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":20,"ins":{"up_context":[{"change":4,"pos":531}],"down_context":[{"change":4,"pos":563}],"flag":"BLOCK","start":445,"end":499,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":531},"to":{"change":4,"start":531,"end":563},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" let mut it = s.lines().map(|i| i.trim_end());"}],"del_contents":[{"Del":" let mut it = s.lines();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":22,"ins":{"up_context":[{"change":4,"pos":564}],"down_context":[{"change":4,"pos":1399}],"flag":"BLOCK","start":500,"end":594,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":564},"to":{"change":4,"start":564,"end":609},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":609},"to":{"change":2,"start":51,"end":131},"introduced_by":2},{"previous":"","flag":"DELETED","from":{"change":2,"pos":131},"to":{"change":4,"start":658,"end":1399},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":658},"to":{"change":4,"start":658,"end":1399},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" // 1st line: packlist name"},{"Add":" let name = it.next().ok_or(Error::UnexpectedEof)?;"}],"del_contents":[{"Del":" // 1st line: packlist name and range\n"},{"Del":" let mut fst = it.next().map(|x| x.trim()).ok_or(Error::UnexpectedEof)?;\n"},{"Del":" if let Some(x) = fst.strip_suffix(':') {\n fst = x;\n }\n let (name, range) = {\n let (rstart, rend) = (fst.find('('), fst.rfind(')'));\n if rstart.is_some() && rend.is_some() && rstart.unwrap() < rend.unwrap() {\n let (rstart, rend) = (rstart.unwrap(), rend.unwrap());\n if rend != (fst.len() - 1) {\n return Err(Error::DataAfterRangeSpec);\n }\n let mut name = fst[..rstart].trim();\n if let Some(x) = name.strip_suffix(':') {\n name = x.trim();\n }\n (name, &fst[rstart + 1..rend])\n } else {\n (fst, \"\")\n }\n };\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":26,"ins":{"up_context":[{"change":4,"pos":1425}],"down_context":[{"change":4,"pos":2344}],"flag":"BLOCK","start":595,"end":768,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1425},"to":{"change":4,"start":1425,"end":1532},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1532},"to":{"change":4,"start":43,"end":419},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":419},"to":{"change":4,"start":1808,"end":2344},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1808},"to":{"change":4,"start":1808,"end":2344},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" let items = it"},{"Add":" .map(|line| match line.parse() {"},{"Add":" Ok(x) => x,"},{"Add":" Err(x) => match x {},"},{"Add":" })"},{"Add":" .collect();"}],"del_contents":[{"Del":" let mut sections = BTreeMap::new();\n let mut section = (String::new(), Section::default());\n"},{"Del":" macro_rules! commit {\n () => {{\n if sections.contains_key(§ion.0) {\n return Err(Error::SectionOverwritten(section.0));\n }\n sections.insert(\n std::mem::take(&mut section.0),\n std::mem::take(&mut section.1),\n );\n }};\n }\n"},{"Del":" for line in it {\n if line.trim().is_empty() {\n continue;\n }\n let (itemdata, desc) = parse_item(line)?;\n if let Some(x) = desc.strip_prefix('#') {\n commit!();\n section.0 = x.trim().to_string();\n section.1.summary = itemdata;\n } else {\n section.1.items.push((itemdata, desc));\n }\n }\n if !section.0.is_empty() || !section.1.items.is_empty() {\n commit!();\n }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":35,"ins":{"up_context":[{"change":4,"pos":2403}],"down_context":[{"change":4,"pos":2463}],"flag":"BLOCK","start":769,"end":1164,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2403},"to":{"change":4,"start":2403,"end":2463},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" items,"},{"Add":" })"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl core::str::FromStr for Item {"},{"Add":" type Err = core::convert::Infallible;"},{"Add":""},{"Add":" fn from_str(line: &str) -> Result {"},{"Add":" let (det, text) = parse_itemdet(line)"},{"Add":" .map(|(det, rest)| (Some(det), rest))"},{"Add":" .unwrap_or((None, line));"},{"Add":" Ok(Self {"},{"Add":" det,"},{"Add":" text: text.to_string(),"}],"del_contents":[{"Del":" range: range.to_string(),\n sections,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":54,"ins":{"up_context":[{"change":4,"pos":2483}],"down_context":[{"change":4,"pos":2548}],"flag":"BLOCK","start":1165,"end":1231,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2483},"to":{"change":4,"start":2483,"end":2548},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2548},"to":{"change":4,"start":420,"end":477},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"fn parse_itemdet(mut line: &str) -> Option<(ItemDetails, &str)> {"}],"del_contents":[{"Del":"fn parse_item(line: &str) -> Result<(ItemData, String), Error> {\n"},{"Del":" let mkerr = || Error::InvalidItem(line.to_string());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":56,"ins":{"up_context":[{"change":4,"pos":2572}],"down_context":[{"change":4,"pos":507}],"flag":"BLOCK","start":1232,"end":1253,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2572},"to":{"change":4,"start":478,"end":507},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" return None;"}],"del_contents":[{"Del":" return Err(mkerr());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":58,"ins":{"up_context":[{"change":4,"pos":513}],"down_context":[{"change":4,"pos":555}],"flag":"BLOCK","start":1254,"end":1348,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":513},"to":{"change":4,"start":513,"end":555},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" let mut ret = ItemDetails {"},{"Add":" markers: Vec::new(),"},{"Add":" multiplier: None,"},{"Add":" };"}],"del_contents":[{"Del":" let mut it = line.chars().peekable();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":63,"ins":{"up_context":[{"change":4,"pos":556}],"down_context":[{"change":4,"pos":868}],"flag":"BLOCK","start":1349,"end":1563,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":556},"to":{"change":4,"start":556,"end":868},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" // parse markers"},{"Add":" while let Some(x) = line.strip_prefix('[') {"},{"Add":" let mut it = x.chars();"},{"Add":" let a = it.next()?;"},{"Add":" let b = it.next()?;"},{"Add":" if ']' != it.next()? {"},{"Add":" return None;"}],"del_contents":[{"Del":" // parse premarkers\n let mut premarkers = Vec::new();\n while it.next_if(|i| *i == '[').is_some() {\n let premarker = it.next().ok_or_else(mkerr)?;\n let _ = it.next().ok_or_else(mkerr)?;\n let c2 = it.next().ok_or_else(mkerr)?;\n if c2 != ']' {\n return Err(mkerr());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":71,"ins":{"up_context":[{"change":4,"pos":878}],"down_context":[{"change":4,"pos":2630}],"flag":"BLOCK","start":1564,"end":1902,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":878},"to":{"change":4,"start":878,"end":975},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" line = it.as_str();"},{"Add":" let wsl = it"},{"Add":" .take_while(|i| i.is_whitespace())"},{"Add":" .map(|i| i.len_utf8())"},{"Add":" .sum::();"},{"Add":" let (space, rest) = line.split_at(wsl);"},{"Add":" ret.markers.push(Spaced {"},{"Add":" val: [a, b],"},{"Add":" space: space.to_string(),"},{"Add":" });"},{"Add":" line = rest;"}],"del_contents":[{"Del":" premarkers.push(premarker);\n while it.next_if(|i| i.is_whitespace()).is_some() {}\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":83,"ins":{"up_context":[{"change":4,"pos":2636}],"down_context":[{"change":4,"pos":2895}],"flag":"BLOCK","start":1903,"end":1956,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2636},"to":{"change":4,"start":976,"end":1036},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" if ret.markers.is_empty() {"},{"Add":" return None;"}],"del_contents":[{"Del":" if premarkers.is_empty() {\n return Err(mkerr());\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":87,"ins":{"up_context":[{"change":4,"pos":2991}],"down_context":[{"change":4,"pos":3493}],"flag":"BLOCK","start":1957,"end":2147,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2991},"to":{"change":4,"start":2991,"end":3382},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3475},"to":{"change":4,"start":3475,"end":3493},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3493},"to":{"change":4,"start":1037,"end":1111},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" if let Some((val, space, rest)) = parse_multiplier(line) {"},{"Add":" ret.multiplier = Some(Spaced {"},{"Add":" val,"},{"Add":" space: space.to_string(),"},{"Add":" });"},{"Add":" line = rest;"}],"del_contents":[{"Del":" // check for multiplier\n // btp : backtrack point if no valid multiplier is found\n let btp = it.clone();\n let mut multiplier = None;\n while let Some(x) = it.next_if(|i| i.is_ascii_digit()) {\n let m = multiplier.get_or_insert(0);\n *m *= 10;\n *m += u32::from((x as u8) - b'0');\n }\n if it.next_if(|&i| i == 'x').is_none() {\n multiplier = None;\n"},{"Del":" it = btp;\n"},{"Del":" } else {\n while it.next_if(|i| i.is_whitespace()).is_some() {}\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":95,"ins":{"up_context":[{"change":4,"pos":3500}],"down_context":[{"change":4,"pos":3605}],"flag":"BLOCK","start":2148,"end":2170,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3500},"to":{"change":4,"start":1112,"end":1253},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" Some((ret, line))"}],"del_contents":[{"Del":" Ok((\n ItemData {\n premarkers,\n multiplier: multiplier.unwrap_or(1),\n },\n it.collect(),\n ))\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":98,"ins":{"up_context":[{"change":4,"pos":3608}],"down_context":[{"change":4,"pos":4212}],"flag":"BLOCK","start":2171,"end":2741,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3608},"to":{"change":4,"start":3608,"end":3937},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3937},"to":{"change":4,"start":1254,"end":1320},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"fn parse_multiplier(line: &str) -> Option<(u32, &str, &str)> {"},{"Add":" if !line.starts_with(|i: char| i.is_ascii_digit()) {"},{"Add":" return None;"},{"Add":" }"},{"Add":" let mut multiplier = 0;"},{"Add":" let mut it = line.chars();"},{"Add":" loop {"},{"Add":" match it.next() {"},{"Add":" Some('x') => {"},{"Add":" let tmp = it.as_str();"},{"Add":" let wsl = it"},{"Add":" .take_while(|i| i.is_whitespace())"},{"Add":" .map(|i| i.len_utf8())"},{"Add":" .sum::();"},{"Add":" let (a, b) = tmp.split_at(wsl);"},{"Add":" return Some((multiplier, a, b));"}],"del_contents":[{"Del":"impl fmt::Display for PackList {\n fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {\n f.write_str(&self.name)?;\n if !self.range.is_empty() {\n write!(f, \" ({})\", self.range)?;\n }\n writeln!(f)?;\n for (section, sdata) in &self.sections {\n if !section.is_empty() {\n"},{"Del":" writeln!(f, \"\\n{}# {}\", sdata.summary, section)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":115,"ins":{"up_context":[{"change":4,"pos":4226}],"down_context":[{"change":4,"pos":4486}],"flag":"BLOCK","start":2742,"end":2882,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4226},"to":{"change":4,"start":4226,"end":4265},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4265},"to":{"change":4,"start":1321,"end":1375},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" Some(i) if i.is_ascii_digit() => {"},{"Add":" multiplier *= 10;"},{"Add":" multiplier += u32::from((i as u8) - b'0');"}],"del_contents":[{"Del":" for item in &sdata.items {\n"},{"Del":" writeln!(f, \"{}{}\", item.0, item.1)?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":119,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4500}],"down_context":[{"change":4,"pos":1376}],"flag":"BLOCK","start":2883,"end":3150,"inode":{"change":4,"pos":34}}},"contents":[{"Add":" _ => return None,"},{"Add":" }"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for PackList {"},{"Add":" fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {"},{"Add":" writeln!(f, \"{}\", self.name.trim_end())?;"},{"Add":" for item in &self.items {"},{"Add":" writeln!(f, \"{}\", item)?;"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":134,"ins":{"up_context":[{"change":4,"pos":1410}],"down_context":[{"change":4,"pos":1443}],"flag":"BLOCK","start":3151,"end":3180,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1410},"to":{"change":4,"start":1410,"end":1443},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":"impl fmt::Display for Item {"}],"del_contents":[{"Del":"impl fmt::Display for ItemData {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":136,"ins":{"up_context":[{"change":4,"pos":1506}],"down_context":[{"change":4,"pos":4500}],"flag":"BLOCK","start":3181,"end":3256,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1506},"to":{"change":4,"start":1506,"end":1579},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" if let Some(x) = &self.det {"},{"Add":" fmt::Display::fmt(x, f)?;"}],"del_contents":[{"Del":" for i in &self.premarkers {\n write!(f, \"[{} ] \", i)?;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":139,"ins":{"up_context":[{"change":4,"pos":4510}],"down_context":[{"change":4,"pos":1663}],"flag":"BLOCK","start":3257,"end":3608,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4510},"to":{"change":4,"start":1580,"end":1663},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" f.write_str(self.text.trim_end())"},{"Add":" }"},{"Add":"}"},{"Add":""},{"Add":"impl fmt::Display for ItemDetails {"},{"Add":" fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {"},{"Add":" for m in &self.markers {"},{"Add":" write!(f, \"[{}{}]{}\", m.val[0], m.val[1], m.space)?;"},{"Add":" }"},{"Add":" if let Some(x) = &self.multiplier {"},{"Add":" write!(f, \"{}x{}\", x.val, x.space)?;"}],"del_contents":[{"Del":" if self.multiplier != 1 {\n write!(f, \"{}x \", self.multiplier)?;\n"}]}},{"Edit":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":158,"atom":{"NewVertex":{"up_context":[{"change":4,"pos":4577}],"down_context":[{"change":2,"pos":132}],"flag":"BLOCK","start":3609,"end":3647,"inode":{"change":4,"pos":34}}},"contents":[{"Add":" use alloc::{string::String, vec};"}]}},{"Edit":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":160,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":162},"to":{"change":4,"start":1674,"end":1675},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4577},"to":{"change":4,"start":1674,"end":1675},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":1675},"to":{"change":4,"start":4577,"end":5021},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4577},"to":{"change":4,"start":4577,"end":5021},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5021},"to":{"change":4,"start":1676,"end":2595},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":2595},"to":{"change":4,"start":5587,"end":5602},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5587},"to":{"change":4,"start":5587,"end":5602},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5602},"to":{"change":4,"start":2596,"end":3413},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":3413},"to":{"change":4,"start":5836,"end":6204},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5836},"to":{"change":4,"start":5836,"end":6204},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":6204},"to":{"change":4,"start":3414,"end":3827},"introduced_by":4}],"inode":{"change":4,"pos":34}}},"contents":[{"Del":"\n"},{"Del":" #[test]\n fn ex0() {\n let inp1 = r#\"Packliste Ölland (80 Tage, 50 Nächtsle):\n[ ] 15 Ruß\n[ ] 132x Wattestäbe\n[# ] 0x Handtuch\n[- ] 5000x # Wachsbaum ... \n[ ] Ranke\n[* ] 5 x Metrik + BNaumbnd\n\"#;\n let inp2 = r#\"Packliste Ölland (80 Tage, 50 Nächtsle)\n[ ] 15 Ruß\n[ ] 132x Wattestäbe\n[# ] 0x Handtuch\n\n[- ] 5000x # Wachsbaum ...\n[ ] Ranke\n[* ] 5 x Metrik + BNaumbnd\n\"#;\n let mut sections = BTreeMap::new();\n"},{"Del":" sections.insert(\n String::new(),\n Section {\n summary: ItemData::default(),\n items: vec![\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"15 Ruß\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 132,\n },\n \"Wattestäbe\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec!['#'],\n multiplier: 0,\n },\n \"Handtuch\".to_string(),\n ),\n ],\n"},{"Del":" },\n"},{"Del":" );\n sections.insert(\n \"Wachsbaum ...\".to_string(),\n Section {\n summary: ItemData {\n premarkers: vec!['-'],\n multiplier: 5000,\n },\n items: vec![\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"Ranke\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec!['*'],\n multiplier: 1,\n },\n \"5 x Metrik + BNaumbnd\".to_string(),\n ),\n ],\n },\n );\n"},{"Del":" let res = PackList {\n name: \"Packliste Ölland\".to_string(),\n range: \"80 Tage, 50 Nächtsle\".to_string(),\n sections,\n };\n assert_eq!(inp1.parse::().unwrap(), res);\n assert_eq!(inp2.parse::().unwrap(), res);\n assert_eq!(res.to_string(), inp2);\n }\n\n #[test]\n fn fail0() {\n"},{"Del":" assert_eq!(\n \"Packl (xyz) ...\\n\".parse::(),\n Err(Error::DataAfterRangeSpec)\n );\n assert_eq!(\n \"P\\n[ ] # 1\\n[ ] # 1\\n\".parse::(),\n Err(Error::SectionOverwritten(\"1\".to_string()))\n );\n assert_eq!(\n \"P\\n[ ]\".parse::(),\n Err(Error::InvalidItem(\"[ ]\".to_string()))\n );\n }\n"}]}},{"Edit":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":162,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3840},"to":{"change":2,"start":163,"end":270},"introduced_by":2}],"inode":{"change":4,"pos":34}}},"contents":[{"Del":" fn fail1() {\n assert_eq!(\"\".parse::(), Err(Error::UnexpectedEof));\n }\n\n #[test]\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":163,"ins":{"up_context":[{"change":4,"pos":3855}],"down_context":[{"change":4,"pos":3924}],"flag":"BLOCK","start":3648,"end":3688,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3855},"to":{"change":4,"start":3855,"end":3924},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" let inp = r#\"Packliste Ölland:"}],"del_contents":[{"Del":" let inp1 = r#\"Packliste Ölland:\n[* ] [ _] [. ] 15 132x Ruß\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":166,"ins":{"up_context":[{"change":4,"pos":3953}],"down_context":[{"change":4,"pos":4404}],"flag":"BLOCK","start":3689,"end":4006,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3953},"to":{"change":4,"start":3953,"end":4404},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" let res = PackList {"},{"Add":" name: \"Packliste Ölland:\".to_string(),"},{"Add":" items: vec![Item {"},{"Add":" det: Some(ItemDetails {"},{"Add":" markers: vec!["},{"Add":" Spaced {"},{"Add":" val: ['*', ' '],"},{"Add":" space: \" \".to_string(),"}],"del_contents":[{"Del":" let inp2 = r#\"Packliste Ölland\n[* ] [ ] [. ] 15 132x Ruß\n[* ] [ ] [. ] 132x Ruß\n\"#;\n let mut sections = BTreeMap::new();\n sections.insert(\n String::new(),\n Section {\n summary: ItemData::default(),\n items: vec![\n (\n ItemData {\n premarkers: vec!['*', ' ', '.'],\n multiplier: 1,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":175,"ins":{"up_context":[{"change":4,"pos":4431}],"down_context":[{"change":4,"pos":4669}],"flag":"BLOCK","start":4007,"end":4137,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4431},"to":{"change":4,"start":4431,"end":4669},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" Spaced {"},{"Add":" val: [' ', '_'],"},{"Add":" space: \" \".to_string(),"}],"del_contents":[{"Del":" \"15 132x Ruß\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec!['*', ' ', '.'],\n multiplier: 132,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":179,"ins":{"up_context":[{"change":4,"pos":4696}],"down_context":[{"change":4,"pos":4944}],"flag":"BLOCK","start":4138,"end":4548,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4696},"to":{"change":4,"start":4696,"end":4944},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" Spaced {"},{"Add":" val: ['.', ' '],"},{"Add":" space: \" \".to_string(),"},{"Add":" },"},{"Add":" ],"},{"Add":" multiplier: Some(Spaced {"},{"Add":" val: 132,"},{"Add":" space: \" \".to_string(),"},{"Add":" }),"},{"Add":" }),"},{"Add":" text: \"Ruß\".to_string(),"},{"Add":" }],"}],"del_contents":[{"Del":" \"Ruß\".to_string(),\n ),\n ],\n },\n );\n let res = PackList {\n name: \"Packliste Ölland\".to_string(),\n range: String::new(),\n sections,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":192,"ins":{"up_context":[{"change":4,"pos":4955}],"down_context":[{"change":2,"pos":271}],"flag":"BLOCK","start":4549,"end":4650,"inode":{"change":4,"pos":34}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4955},"to":{"change":4,"start":4955,"end":5118},"introduced_by":4}],"inode":{"change":4,"pos":34}},"ins_contents":[{"Add":" assert_eq!(inp.parse::().unwrap(), res);"},{"Add":" assert_eq!(res.to_string(), inp);"}],"del_contents":[{"Del":" assert_eq!(inp1.parse::().unwrap(), res);\n assert_eq!(inp2.parse::().unwrap(), res);\n assert_eq!(res.to_string(), inp2);\n"}]}},{"Edit":{"inode":{"change":4,"pos":34},"path":"crates/zhed-packlist/src/serial.rs","line":201,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":403}],"down_context":[{"change":4,"pos":6509}],"flag":"BLOCK","start":4651,"end":5201,"inode":{"change":4,"pos":34}}},"contents":[{"Add":""},{"Add":" #[test]"},{"Add":" fn correctly_trimmed(s in \"(?s:.+)\") {"},{"Add":" let s2: String = s.lines().flat_map(|i| i.trim_end().chars().chain(core::iter::once('\\n'))).collect();"},{"Add":" let x1 = s.parse::().unwrap();"},{"Add":" let x2 = s2.parse::().unwrap();"},{"Add":" assert_eq!(x1, x2);"},{"Add":" }"},{"Add":""},{"Add":" #[test]"},{"Add":" fn roundtrip(s in \"(?s:[^\\r]+\\n)\".prop_filter(\"line ends are trimmed\", |v| v.lines().all(|l| l == l.trim_end()))) {"},{"Add":" assert_eq!(s, s.parse::().unwrap().to_string());"},{"Add":" }"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":1,"ins":{"up_context":[{"change":4,"pos":73}],"down_context":[{"change":4,"pos":106}],"flag":"BLOCK","start":5202,"end":5448,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":73},"to":{"change":4,"start":74,"end":106},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"#![cfg_attr(not(feature = \"std\"), no_std)]"},{"Add":"#![forbid("},{"Add":" unsafe_code,"},{"Add":" clippy::as_conversions,"},{"Add":" clippy::cast_ptr_alignment,"},{"Add":" trivial_casts,"},{"Add":" unconditional_recursion"},{"Add":")]"},{"Add":""},{"Add":"extern crate alloc;"},{"Add":"use alloc::{string::String, vec, vec::Vec};"}],"del_contents":[{"Del":"use std::collections::BTreeMap;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":19,"ins":{"up_context":[{"change":4,"pos":240}],"down_context":[{"change":4,"pos":308}],"flag":"BLOCK","start":5449,"end":5591,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":240},"to":{"change":4,"start":240,"end":308},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":" pub items: Vec,"},{"Add":"}"},{"Add":""},{"Add":"#[derive(Clone, Debug, PartialEq, Eq)]"},{"Add":"pub struct Item {"},{"Add":" pub det: Option,"},{"Add":" pub text: String,"}],"del_contents":[{"Del":" pub range: String,\n pub sections: BTreeMap,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":28,"ins":{"up_context":[{"change":4,"pos":311}],"down_context":[{"change":4,"pos":447}],"flag":"BLOCK","start":5592,"end":5764,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":311},"to":{"change":4,"start":311,"end":447},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"/// packlist item details"},{"Add":"#[derive(Clone, Debug, PartialEq, Eq)]"},{"Add":"pub struct ItemDetails {"},{"Add":" pub markers: Vec>,"},{"Add":" pub multiplier: Option>,"}],"del_contents":[{"Del":"#[derive(Clone, Debug, Default, PartialEq, Eq)]\npub struct Section {\n pub summary: ItemData,\n pub items: Vec<(ItemData, String)>,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":36,"ins":{"up_context":[{"change":4,"pos":489}],"down_context":[{"change":4,"pos":561}],"flag":"BLOCK","start":5765,"end":5865,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":489},"to":{"change":4,"start":489,"end":511},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":511},"to":{"change":4,"start":5119,"end":5150},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5150},"to":{"change":4,"start":536,"end":561},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":536},"to":{"change":4,"start":536,"end":561},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"pub struct Spaced {"},{"Add":" pub val: T,"},{"Add":" // white space folloing the value"},{"Add":" pub space: String,"}],"del_contents":[{"Del":"pub struct ItemData {\n"},{"Del":" pub premarkers: Vec,\n"},{"Del":" pub multiplier: u32,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":42,"ins":{"up_context":[{"change":4,"pos":564}],"down_context":[{"change":4,"pos":592}],"flag":"BLOCK","start":5866,"end":5897,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":564},"to":{"change":4,"start":564,"end":592},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"impl Default for ItemDetails {"}],"del_contents":[{"Del":"impl Default for ItemData {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":45,"ins":{"up_context":[{"change":4,"pos":634}],"down_context":[{"change":4,"pos":689}],"flag":"BLOCK","start":5898,"end":6050,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":634},"to":{"change":4,"start":5151,"end":5186},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5186},"to":{"change":4,"start":662,"end":689},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":662},"to":{"change":4,"start":662,"end":689},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":" markers: vec![Spaced {"},{"Add":" val: [' ', ' '],"},{"Add":" space: String::new(),"},{"Add":" }],"},{"Add":" multiplier: None,"}],"del_contents":[{"Del":" premarkers: vec![' '],\n"},{"Del":" multiplier: 1,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":54,"ins":{"up_context":[{"change":4,"pos":708}],"down_context":[{"change":4,"pos":844}],"flag":"BLOCK","start":6051,"end":6160,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":708},"to":{"change":4,"start":708,"end":765},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":765},"to":{"change":4,"start":5187,"end":5286},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":5286},"to":{"change":4,"start":838,"end":844},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":838},"to":{"change":4,"start":838,"end":844},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"pub trait Commands {"},{"Add":" fn reset_markers(&mut self);"},{"Add":"}"},{"Add":""},{"Add":"pub mod prelude {"},{"Add":" pub use crate::Commands as _;"}],"del_contents":[{"Del":"impl PackList {\n pub fn reset_premarkers(&mut self) {\n"},{"Del":" self.sections\n .values_mut()\n .for_each(|sd| sd.reset_premarkers());\n"},{"Del":" }\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":62,"ins":{"up_context":[{"change":4,"pos":847}],"down_context":[{"change":4,"pos":1012}],"flag":"BLOCK","start":6161,"end":6287,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":847},"to":{"change":4,"start":847,"end":903},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":903},"to":{"change":4,"start":5287,"end":5491},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"impl Commands for PackList {"},{"Add":" fn reset_markers(&mut self) {"},{"Add":" self.items.iter_mut().for_each(|i| i.reset_markers());"}],"del_contents":[{"Del":"impl Section {\n pub fn reset_premarkers(&mut self) {\n"},{"Del":" core::iter::once(&mut self.summary)\n .chain(self.items.iter_mut().map(|item| &mut item.0))\n .flat_map(|item| item.premarkers.iter_mut())\n .for_each(|i| *i = ' ');\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":68,"ins":{"up_context":[{"change":4,"pos":1021}],"down_context":[{"change":4,"pos":1064}],"flag":"BLOCK","start":6288,"end":6437,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1021},"to":{"change":4,"start":1021,"end":1064},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"impl Commands for Item {"},{"Add":" fn reset_markers(&mut self) {"},{"Add":" if let Some(x) = &mut self.det {"},{"Add":" x.reset_markers();"},{"Add":" }"},{"Add":" }"},{"Add":"}"}],"del_contents":[{"Del":"#[cfg(test)]\nmod tests {\n use super::*;\n"}]}},{"Replacement":{"inode":{"change":4,"pos":73},"path":"crates/zhed-packlist/src/lib.rs","line":76,"ins":{"up_context":[{"change":4,"pos":1065}],"down_context":[{"change":4,"pos":3232}],"flag":"BLOCK","start":6438,"end":6570,"inode":{"change":4,"pos":73}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1065},"to":{"change":4,"start":1065,"end":1138},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1138},"to":{"change":4,"start":5492,"end":6411},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":6411},"to":{"change":4,"start":1704,"end":1719},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1704},"to":{"change":4,"start":1704,"end":1719},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1719},"to":{"change":4,"start":6412,"end":7229},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":7229},"to":{"change":4,"start":1953,"end":2171},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":1953},"to":{"change":4,"start":1953,"end":2171},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2171},"to":{"change":4,"start":7230,"end":8957},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":8957},"to":{"change":4,"start":2739,"end":2754},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2739},"to":{"change":4,"start":2739,"end":2754},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2754},"to":{"change":4,"start":8958,"end":8969},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":8969},"to":{"change":4,"start":2988,"end":3232},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":2988},"to":{"change":4,"start":2988,"end":3232},"introduced_by":4}],"inode":{"change":4,"pos":73}},"ins_contents":[{"Add":"impl Commands for ItemDetails {"},{"Add":" fn reset_markers(&mut self) {"},{"Add":" self.markers.iter_mut().for_each(|i| i.val = [' ', ' ']);"}],"del_contents":[{"Del":" #[test]\n fn ex0rs() {\n let mut sections = BTreeMap::new();\n"},{"Del":" sections.insert(\n String::new(),\n Section {\n summary: ItemData::default(),\n items: vec![\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"15 Ruß\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 132,\n },\n \"Wattestäbe\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec!['#'],\n multiplier: 0,\n },\n \"Handtuch\".to_string(),\n ),\n ],\n"},{"Del":" },\n"},{"Del":" );\n sections.insert(\n \"Wachsbaum ...\".to_string(),\n Section {\n summary: ItemData {\n premarkers: vec!['-'],\n multiplier: 5000,\n },\n items: vec![\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"Ranke\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec!['*'],\n multiplier: 1,\n },\n \"5 x Metrik + BNaumbnd\".to_string(),\n ),\n ],\n },\n );\n"},{"Del":" let mut res = PackList {\n name: \"Packliste Ölland\".to_string(),\n range: \"80 Tage, 50 Nächtsle\".to_string(),\n sections,\n };\n let mut sections2 = BTreeMap::new();\n"},{"Del":" sections2.insert(\n String::new(),\n Section {\n summary: ItemData::default(),\n items: vec![\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"15 Ruß\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 132,\n },\n \"Wattestäbe\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 0,\n },\n \"Handtuch\".to_string(),\n ),\n ],\n },\n );\n sections2.insert(\n \"Wachsbaum ...\".to_string(),\n Section {\n summary: ItemData {\n premarkers: vec![' '],\n multiplier: 5000,\n },\n items: vec![\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"Ranke\".to_string(),\n ),\n (\n ItemData {\n premarkers: vec![' '],\n multiplier: 1,\n },\n \"5 x Metrik + BNaumbnd\".to_string(),\n ),\n ],\n"},{"Del":" },\n"},{"Del":" );\n"},{"Del":" let res2 = PackList {\n name: \"Packliste Ölland\".to_string(),\n range: \"80 Tage, 50 Nächtsle\".to_string(),\n sections: sections2,\n };\n res.reset_premarkers();\n assert_eq!(res, res2);\n"}]}},{"Edit":{"inode":{"change":3,"pos":63},"path":"crates/zhed-packlist/src/bin/zhed-packlist-reset.rs","line":2,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":83}],"down_context":[{"change":3,"pos":83}],"flag":"BLOCK","start":6571,"end":6602,"inode":{"change":3,"pos":63}}},"contents":[{"Add":"use zhed_packlist::prelude::*;"}]}},{"Replacement":{"inode":{"change":3,"pos":63},"path":"crates/zhed-packlist/src/bin/zhed-packlist-reset.rs","line":8,"ins":{"up_context":[{"change":3,"pos":178}],"down_context":[{"change":3,"pos":277}],"flag":"BLOCK","start":6603,"end":6729,"inode":{"change":3,"pos":63}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":178},"to":{"change":3,"start":178,"end":277},"introduced_by":3}],"inode":{"change":3,"pos":63}},"ins_contents":[{"Add":" std::io::stdin()"},{"Add":" .lock()"},{"Add":" .read_to_string(&mut inp)"},{"Add":" .expect(\"unable to read packlist from stdin\");"}],"del_contents":[{"Del":" std::io::stdin().lock().read_to_string(&mut inp).expect(\"unable to read packlist from stdin\");\n"}]}},{"Replacement":{"inode":{"change":3,"pos":63},"path":"crates/zhed-packlist/src/bin/zhed-packlist-reset.rs","line":13,"ins":{"up_context":[{"change":3,"pos":367}],"down_context":[{"change":3,"pos":394}],"flag":"BLOCK","start":6730,"end":6754,"inode":{"change":3,"pos":63}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":367},"to":{"change":3,"start":367,"end":394},"introduced_by":3}],"inode":{"change":3,"pos":63}},"ins_contents":[{"Add":" pl.reset_markers();"}],"del_contents":[{"Del":" pl.reset_premarkers();\n"}]}},{"Replacement":{"inode":{"change":4,"pos":3276},"path":"crates/zhed-packlist/Cargo.toml","line":7,"ins":{"up_context":[{"change":4,"pos":3361}],"down_context":[{"change":2,"pos":404}],"flag":"BLOCK","start":6755,"end":6813,"inode":{"change":4,"pos":3276}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":3361},"to":{"change":4,"start":8970,"end":8988},"introduced_by":4}],"inode":{"change":4,"pos":3276}},"ins_contents":[{"Add":""},{"Add":"[dependencies.thiserror]"},{"Add":"version = \"1.0\""},{"Add":"optional = true"}],"del_contents":[{"Del":"thiserror = \"1.0\"\n"}]}},{"Edit":{"inode":{"change":4,"pos":3276},"path":"crates/zhed-packlist/Cargo.toml","line":14,"atom":{"NewVertex":{"up_context":[{"change":2,"pos":441}],"down_context":[],"flag":"BLOCK","start":6814,"end":6848,"inode":{"change":4,"pos":3276}}},"contents":[{"Add":""},{"Add":"[features]"},{"Add":"std = [ \"thiserror\" ]"}]}}],"owner":"fogti","repo":"zhed","token":"GGEWAfo1uD4UVm/gazwPLBLKGFjbhkjiGk+L+SIy/ho=","login":null}

…

Dependencies

Change contents