{"header":{"message":"slightly restructuring","description":null,"timestamp":"2021-09-26T18:45:00.775603438Z","authors":[{}]},"hash":"OBYTQWLPCGBRJLHKBJZZN2JGI4XHXG4KV72EF2L7ZBVR6Z3U6CRQC","authors":[{"login":"fogti","key":"mQomBKsugf4JAHNPzJ3wTU2mZ3UbLxyWmiDrmq4Syqg"}],"deps":{"hashes":[["OBYTQWLPCGBRJLHKBJZZN2JGI4XHXG4KV72EF2L7ZBVR6Z3U6CRQC","slightly restructuring"],["AA",null],["ZLXYE6PVKPKYEKFI2Q7TZACOX42MLA2KZIS5VCP3DNCNS5M55UXQC","cargo clippy + fmt fixes"],["NAZOIBERE343KHGKHEAQ6DNQFVDWCA7TPAHUR6TCJB5BRHTQPE3QC","packlist: fix crash on empty input"],["VLUIVUU5SQKL6NPXBHT75UHM23UJ34IX24HSGXIBKFKRIFJIFBJAC","initialize repository"],["V4EAN7NNXKHQFA3HDHRREMWNWRB3XSHIOTE2G4VLHTRMTFD7NP4QC","move some stuff around; more packlist stuff"],["BUI22CYQ7XPD64JNBPOQZJMO5KDXSTFWPT3CXLOGL5EHVTO63SMAC","+zhed-packlist"]],"deps":["ZLXYE6PVKPKYEKFI2Q7TZACOX42MLA2KZIS5VCP3DNCNS5M55UXQC"],"known":["VLUIVUU5SQKL6NPXBHT75UHM23UJ34IX24HSGXIBKFKRIFJIFBJAC","V4EAN7NNXKHQFA3HDHRREMWNWRB3XSHIOTE2G4VLHTRMTFD7NP4QC","NAZOIBERE343KHGKHEAQ6DNQFVDWCA7TPAHUR6TCJB5BRHTQPE3QC"]},"hunks":[{"FileDel":{"deleted_names":[{"basename":"valuemodel.rs","metadata":0}],"del":{"EdgeMap":{"edges":[{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":6555},"to":{"change":3,"start":6556,"end":6593},"introduced_by":3},{"previous":"BLOCK | FOLDER","flag":"BLOCK | FOLDER | DELETED","from":{"change":3,"pos":6593},"to":{"change":3,"start":6594,"end":6594},"introduced_by":3}],"inode":{"change":3,"pos":6594}}},"content_edges":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":55},"to":{"change":3,"start":6595,"end":6626},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6594},"to":{"change":3,"start":6595,"end":6626},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6663},"to":{"change":3,"start":6663,"end":6679},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6697},"to":{"change":3,"start":6697,"end":8517},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":195},"to":{"change":3,"start":8624,"end":8748},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8624},"to":{"change":3,"start":8624,"end":8748},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":269},"to":{"change":3,"start":8821,"end":9279},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8821},"to":{"change":3,"start":8821,"end":9279},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":284},"to":{"change":3,"start":9294,"end":9422},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9294},"to":{"change":3,"start":9294,"end":9422},"introduced_by":3},{"previous":"","flag":"DELETED","from":{"change":2,"pos":435},"to":{"change":3,"start":9541,"end":9972},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9541},"to":{"change":3,"start":9541,"end":9972},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9422},"to":{"change":2,"start":285,"end":435},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":9279},"to":{"change":2,"start":270,"end":284},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8748},"to":{"change":2,"start":196,"end":269},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8517},"to":{"change":2,"start":56,"end":195},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":6594},"to":{"change":2,"start":0,"end":55},"introduced_by":2}],"inode":{"change":3,"pos":6594}},"content":[{"Del":"use std::collections::HashMap;\n"},{"Del":"use uuid::Uuid;\n"},{"Del":"\n#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq)]\npub enum Space {\n ParaBreak,\n}\n\n#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]\npub enum ListType {\n Unordered,\n Ordered,\n}\n\n#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Eq)]\npub enum Value {\n /// unbound variable, referenced by UUID to make renaming easier\n UnboundVar(Uuid),\n\n /// bound variable, referenced using [De Bruijn indices](https://en.wikipedia.org/wiki/De_Bruijn_index),\n /// starting at 0\n BoundVar(usize),\n\n /// tagged elements, no order of evaluation is guaranteed, arguments are lazily evaluated\n Tag(Uuid, Vec),\n\n Space(Space),\n\n List(ListType, Vec),\n}\n\n/** document data structure\n\n## header stuff\n\nwe omit any document type tags of older formats, because we don't want to\ndifferentiate that much here, because it would make parsing cumbersome.\nwe rather differentiate directly via indexes. Historically, type tags were\nvastly different per format nonetheless, making them slightly incompatible.\n**/\n#[derive(Clone, Debug, Deserialize, Serialize)]\npub struct Document {\n #[serde(flatten)]\n ident: Ident,\n\n unbound_vars: HashMap,\n\n toplevel: Vec,\n}\n\npub struct Context<'a> {\n unbound_vars: &'a HashMap,\n bound_vars: Vec,\n}\n\nimpl Document {\n pub fn ctx(&self) -> Context<'_> {\n Context {\n unbound_vars: &self.unbound_vars,\n bound_vars: Vec::new(),\n }\n }\n}\n\n#[derive(Debug, thiserror::Error)]\npub enum Error {\n #[error(\"unbound variable not found: {0}\")]\n UnboundVarNotFound(Uuid),\n #[error(\"bound variable not found\")]\n BoundVarNotFound,\n}\n\nimpl<'a> Context<'a> {\n pub fn lookup_unbound_var(&self, id: &Uuid) -> Result<&'a str, Error> {\n"},{"Del":" }\n\n pub fn on_bound_var(&mut self, name: String, f: F) -> R\n where\n F: FnOnce(&mut Self) -> R,\n {\n"},{"Del":" #[cfg(debug_assertions)]\n let name2 = name.clone();\n self.bound_vars.push(name);\n let tmp = catch_unwind(AssertUnwindSafe(|| f(self)));\n #[allow(unused_variables)]\n let tmp2 = self.bound_vars.pop();\n match tmp {\n Ok(x) => {\n #[cfg(debug_assertions)]\n if tmp2 != Some(name2) {\n panic!(\"mismatching bound vars\");\n }\n\n x\n"},{"Del":" Err(y) => resume_unwind(y),\n }\n }\n\n pub fn lookup_bound_var(&self, id: usize) -> Result<&str, Error> {\n"},{"Del":" }\n}\n\n/// Formatter-oriented serialization, because we usually define that per formatter,\n/// and the structures which are serialized stay mostly the same.\npub trait Serializer: Sized {\n type Ok;\n type Error: From + std::error::Error;\n\n fn serialize_value(self, v: &Value, ctx: &mut Context<'_>) -> Result;\n fn serialize_document(self, d: &Document) -> Result;\n}\n"},{"Del":" self.bound_vars\n .get(self.bound_vars.len() - 1 - id)\n .map(|i| i.as_str())\n .ok_or(Error::BoundVarNotFound)\n"},{"Del":" }\n"},{"Del":" use std::panic::{catch_unwind, resume_unwind, AssertUnwindSafe};\n"},{"Del":" self.unbound_vars\n .get(id)\n .map(|i| i.as_str())\n .ok_or_else(|| Error::UnboundVarNotFound(*id))\n"},{"Del":"use crate::Ident;\nuse serde::{Deserialize, Serialize};\n"}]}},{"Edit":{"inode":{"change":3,"pos":10686},"path":"crates/zhed-core/src/lib.rs","line":1,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":10686}],"down_context":[{"change":3,"pos":10687}],"flag":"BLOCK","start":0,"end":56,"inode":{"change":3,"pos":10686}}},"contents":[{"Add":"#![no_std]"},{"Add":""},{"Add":"extern crate alloc;"},{"Add":"use alloc::borrow::Cow;"}]}},{"Edit":{"inode":{"change":3,"pos":10686},"path":"crates/zhed-core/src/lib.rs","line":6,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10724},"to":{"change":3,"start":10724,"end":10747},"introduced_by":3}],"inode":{"change":3,"pos":10686}}},"contents":[{"Del":"use std::borrow::Cow;\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":10686},"path":"crates/zhed-core/src/lib.rs","line":8,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10784},"to":{"change":3,"start":10784,"end":10804},"introduced_by":3}],"inode":{"change":3,"pos":10686}}},"contents":[{"Del":"pub mod valuemodel;\n"}]}},{"Replacement":{"inode":{"change":3,"pos":11450},"path":"crates/zhed-core/Cargo.toml","line":3,"ins":{"up_context":[{"change":3,"pos":11480}],"down_context":[{"change":3,"pos":11522}],"flag":"BLOCK","start":57,"end":110,"inode":{"change":3,"pos":11450}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11480},"to":{"change":3,"start":11480,"end":11522},"introduced_by":3}],"inode":{"change":3,"pos":11450}},"ins_contents":[{"Add":"description = \"zhed core data structures and traits\""}],"del_contents":[{"Del":"description = \"zhed core data structures\"\n"}]}},{"Edit":{"inode":{"change":3,"pos":11450},"path":"crates/zhed-core/Cargo.toml","line":9,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11596},"to":{"change":3,"start":11596,"end":11614},"introduced_by":3}],"inode":{"change":3,"pos":11450}}},"contents":[{"Del":"thiserror = \"1.0\"\n"}]}},{"Edit":{"inode":{"change":3,"pos":11450},"path":"crates/zhed-core/Cargo.toml","line":10,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":11615},"to":{"change":3,"start":11615,"end":11702},"introduced_by":3}],"inode":{"change":3,"pos":11450}}},"contents":[{"Del":"[dependencies.chrono]\nversion = \"0.4\"\ndefault-features = false\nfeatures = [ \"serde\" ]\n\n"}]}},{"Edit":{"inode":{"change":3,"pos":11450},"path":"crates/zhed-core/Cargo.toml","line":12,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":11739}],"down_context":[{"change":3,"pos":11739}],"flag":"BLOCK","start":111,"end":136,"inode":{"change":3,"pos":11450}}},"contents":[{"Add":"default-features = false"}]}},{"Edit":{"inode":{"change":3,"pos":7733},"path":"Cargo.lock","line":43,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":1430},"to":{"change":3,"start":8028,"end":8277},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8028},"to":{"change":3,"start":8028,"end":8277},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8277},"to":{"change":3,"start":1431,"end":1433},"introduced_by":3}],"inode":{"change":3,"pos":7733}}},"contents":[{"Del":"\n[[package]]\nname = \"chrono\"\nversion = \"0.4.19\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73\"\ndependencies = [\n \"num-integer\",\n \"num-traits\",\n \"serde\",\n"},{"Del":"]\n"}]}},{"Edit":{"inode":{"change":3,"pos":7733},"path":"Cargo.lock","line":74,"atom":{"EdgeMap":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":2245},"to":{"change":3,"start":8292,"end":8534},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":8292},"to":{"change":3,"start":8292,"end":8534},"introduced_by":3}],"inode":{"change":3,"pos":7733}}},"contents":[{"Del":"name = \"num-integer\"\nversion = \"0.1.44\"\nsource = \"registry+https://github.com/rust-lang/crates.io-index\"\nchecksum = \"d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db\"\ndependencies = [\n \"autocfg\",\n \"num-traits\",\n]\n\n[[package]]\n"}]}},{"Edit":{"inode":{"change":3,"pos":7733},"path":"Cargo.lock","line":351,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":10613},"to":{"change":3,"start":10613,"end":10624},"introduced_by":3}],"inode":{"change":3,"pos":7733}}},"contents":[{"Del":" \"chrono\",\n"}]}},{"Edit":{"inode":{"change":3,"pos":7733},"path":"Cargo.lock","line":352,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":3,"pos":12159},"to":{"change":3,"start":12159,"end":12173},"introduced_by":3}],"inode":{"change":3,"pos":7733}}},"contents":[{"Del":" \"thiserror\",\n"}]}},{"Edit":{"inode":{"change":3,"pos":7733},"path":"Cargo.lock","line":360,"atom":{"NewVertex":{"up_context":[{"change":7,"pos":3956}],"down_context":[{"change":3,"pos":12223}],"flag":"BLOCK","start":137,"end":246,"inode":{"change":3,"pos":7733}}},"contents":[{"Add":"name = \"zhed-models\""},{"Add":"version = \"0.0.0\""},{"Add":"dependencies = ["},{"Add":" \"serde\","},{"Add":" \"thiserror\","},{"Add":" \"zhed-core\","},{"Add":"]"},{"Add":""},{"Add":"[[package]]"}]}},{"Edit":{"inode":{"change":3,"pos":7733},"path":"Cargo.lock","line":375,"atom":{"NewVertex":{"up_context":[{"change":3,"pos":10722}],"down_context":[],"flag":"BLOCK","start":247,"end":329,"inode":{"change":3,"pos":7733}}},"contents":[{"Add":""},{"Add":"[[package]]"},{"Add":"name = \"ztx-core\""},{"Add":"version = \"0.0.0\""},{"Add":"dependencies = ["},{"Add":" \"thiserror\","},{"Add":"]"}]}}],"owner":"fogti","repo":"zhed","token":"FwhAhdEaCaXjUue4S/3x6hz3iK/WJuUkkLI76SBq/9w=","login":null}

…

Dependencies

Change contents