{"header":{"message":"Fixing warnings with Rust 1.57 + cleanup","description":null,"timestamp":"2021-12-06T09:11:21.127702285Z","authors":[{}]},"hash":"KVCXCDRMB6RLPPKI5QYQAGNEQ342OUL37VWN7QKJRCUP2HIVZSAQC","authors":[{"login":"pmeunier","key":"FZQ2g7VfnzLYM4mtTVDk9HAZjA8Jk9ndkwN1icgbtWUr"}],"deps":{"hashes":[["KVCXCDRMB6RLPPKI5QYQAGNEQ342OUL37VWN7QKJRCUP2HIVZSAQC","Fixing warnings with Rust 1.57 + cleanup"],["AA",null],["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","Resurrecting tests, and type cleanup (no need for Arc> anymore)"],["7WIVT3R7HXPYTWRUMW6JGHVUTKRBRMD6SA7RQCMXVWNII5VJCSAAC","binary diff creates new chunk when no exact match found"],["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","Fixing the bad changes in history (unfortunately, by rebooting)."],["A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","Integrating identity malleability"],["SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","Reading ~/.ssh/config"],["KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","Locking stderr and the progress bar in SSH"],["I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","Various post-fire fixes"],["KLBWKCUZF3ATGINZCGJL5U7MGD7EBJYDORLWDUDMNWMSN2COJ2ZQC","use ssh url syntax like git"],["H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","a few more clippy lints addressed"],["4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC","Fixing a number of bugs related to encodings (extra newlines + misdetection in linux2x)"],["TGA6QXGIZBDTXMOCHH23HJUGWYOCJQ32M3CQ3U7HUF3TDJO6QNIQC","Initial support for binary diffs (conflicts are not yet supported in the output)"],["VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","Removing anyhow in libpijul"],["LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","Formatting"]],"deps":["FXEDPLRI7PXLDXV634ZA6D5Q3ZWG3ESTKJTMRPJ4MAHI7PKU3M6AC","7WIVT3R7HXPYTWRUMW6JGHVUTKRBRMD6SA7RQCMXVWNII5VJCSAAC"],"known":["SXEYMYF7P4RZMZ46WPL4IZUTSQ2ATBWYZX7QNVMS3SGOYXYOHAGQC","SZWBLWZ4LUJZHTSYOIGJMXM7KPCGWJFPKLHYA5MHY7UTPNLZV5KQC","H23LO7U7MNB5GTLOUIFYAJ6DP57DM3VFBR4IBOAVPMHS356AYFPQC","KTTKF3RWYAK2YSH2DYYW5QVG4KSNGWUBJBFHKE24OJ7LFCBF5FEAC","VO5OQW4W2656DIYYRNZ3PO7TQ4JOKQ3GVWE5ALUTYVMX3WMXJOYQC","I24UEJQLCH2SOXA4UHIYWTRDCHSOPU7AFTRUOTX7HZIAV4AZKYEQC","KLBWKCUZF3ATGINZCGJL5U7MGD7EBJYDORLWDUDMNWMSN2COJ2ZQC","A3RM526Y7LUXNYW4TL56YKQ5GVOK2R5D7JJVTSQ6TT5MEXIR6YAAC","TGA6QXGIZBDTXMOCHH23HJUGWYOCJQ32M3CQ3U7HUF3TDJO6QNIQC","LV34DUJYQNSHJSNFALRRS3FFQWUU57HIJU26TTKNXDFWD6UWD4QAC","4DNDMC7IUZNYLDEQQYYF5K3G2QWWXGQENTEWPNTM6XKQEFPW7L3QC"]},"hunks":[{"Edit":{"inode":{"change":4,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":46,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26241},"to":{"change":4,"start":0,"end":19},"introduced_by":4},{"previous":"","flag":"DELETED","from":{"change":4,"pos":19},"to":{"change":4,"start":26241,"end":26260},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26241},"to":{"change":4,"start":26241,"end":26260},"introduced_by":4}],"inode":{"change":4,"pos":25380}}},"contents":[{"Del":" addr: &'a str,\n"},{"Del":" host: &'a str,\n"}]}},{"Replacement":{"inode":{"change":4,"pos":25380},"path":"pijul/src/remote/ssh.rs","line":83,"ins":{"up_context":[{"change":4,"pos":453}],"down_context":[{"change":4,"pos":27295}],"flag":"BLOCK","start":0,"end":34,"inode":{"change":4,"pos":25380}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":4,"pos":453},"to":{"change":4,"start":447,"end":530},"introduced_by":4},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":447},"to":{"change":4,"start":447,"end":530},"introduced_by":4}],"inode":{"change":4,"pos":25380}},"ins_contents":[{"Add":" Some(Remote { path, config })"}],"del_contents":[{"Del":" Some(Remote {\n addr,\n host,\n path,\n config,\n })\n"}]}},{"Replacement":{"inode":{"change":4,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":241,"ins":{"up_context":[{"change":4,"pos":206878}],"down_context":[{"change":2,"pos":392}],"flag":"BLOCK","start":35,"end":123,"inode":{"change":4,"pos":199222}},"del":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":206878},"to":{"change":4,"start":2604,"end":2693},"introduced_by":4}],"inode":{"change":4,"pos":199222}},"ins_contents":[{"Add":" fn modified_time(&self, file: &str) -> Result {"}],"del_contents":[{"Del":" fn modified_time(&self, _file: &str) -> Result {\n"}]}},{"Replacement":{"inode":{"change":4,"pos":199222},"path":"libpijul/src/working_copy/memory.rs","line":243,"ins":{"up_context":[{"change":2,"pos":423}],"down_context":[{"change":4,"pos":207000}],"flag":"BLOCK","start":124,"end":339,"inode":{"change":4,"pos":199222}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":2,"pos":423},"to":{"change":4,"start":26299,"end":26327},"introduced_by":2},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":26299},"to":{"change":4,"start":26299,"end":26327},"introduced_by":4}],"inode":{"change":4,"pos":199222}},"ins_contents":[{"Add":" match m.get_file(file) {"},{"Add":" Some(Inode::Directory { last_modified, .. })"},{"Add":" | Some(Inode::File { last_modified, .. }) => Ok(*last_modified),"},{"Add":" _ => Ok(m.last_modified),"},{"Add":" }"}],"del_contents":[{"Del":" Ok(m.last_modified)\n"}]}},{"Replacement":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":60,"ins":{"up_context":[{"change":3,"pos":110}],"down_context":[{"change":3,"pos":111}],"flag":"BLOCK","start":340,"end":380,"inode":{"change":4,"pos":2530}},"del":{"edges":[{"previous":"","flag":"DELETED","from":{"change":3,"pos":110},"to":{"change":4,"start":4082,"end":4122},"introduced_by":3},{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4082},"to":{"change":4,"start":4082,"end":4122},"introduced_by":4}],"inode":{"change":4,"pos":2530}},"ins_contents":[{"Add":" for &(_, old) in v.iter() {"}],"del_contents":[{"Del":" for &(v, old) in v.iter() {\n"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":67,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":4266},"to":{"change":4,"start":4266,"end":4302},"introduced_by":4}],"inode":{"change":4,"pos":2530}}},"contents":[{"Del":" old_pos: v,\n"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":126,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5708},"to":{"change":4,"start":5708,"end":5732},"introduced_by":4}],"inode":{"change":4,"pos":2530}}},"contents":[{"Del":" old_pos: usize,\n"}]}},{"Edit":{"inode":{"change":4,"pos":2530},"path":"libpijul/src/diff/bin.rs","line":133,"atom":{"EdgeMap":{"edges":[{"previous":"BLOCK","flag":"BLOCK | DELETED","from":{"change":4,"pos":5800},"to":{"change":4,"start":5800,"end":9029},"introduced_by":4}],"inode":{"change":4,"pos":2530}}},"contents":[{"Del":"\n/*\npub fn diff(window: usize, a: &[u8], b: &[u8], d: D)\nwhere\n D::Error: std::fmt::Debug,\n{\n let a_h = make_old_chunks(window, a);\n let bb = make_new_chunks(window, &a_h, b);\n // Make a dummy vector (because `std::ops::Index` wants a borrow).\n let mut aa = Vec::with_capacity(a.len() / window + 1);\n for pos in 0..(a.len() + window - 1) / window {\n aa.push(pos)\n }\n diffs::myers::diff(\n &mut W {\n d,\n window,\n old_len: a.len(),\n a: &aa,\n b: &bb,\n },\n &aa,\n 0,\n aa.len(),\n &bb,\n 0,\n bb.len(),\n )\n .unwrap();\n}\n\n\nimpl Chunk {\n fn start(&self) -> usize {\n match *self {\n Chunk::Old { start, .. } => start,\n Chunk::New { start, .. } => start,\n }\n }\n}\n\nimpl PartialEq for Chunk {\n fn eq(&self, b: &usize) -> bool {\n if let Chunk::Old { old_pos, .. } = *self {\n old_pos == *b\n } else {\n false\n }\n }\n}\n\n#[derive(Debug)]\nstruct W<'a, D> {\n d: D,\n window: usize,\n old_len: usize,\n a: &'a [usize],\n b: &'a [Chunk],\n}\n\nimpl<'a, D: diffs::Diff> diffs::Diff for W<'a, D>\nwhere\n D::Error: std::fmt::Debug,\n{\n type Error = D::Error;\n fn equal(&mut self, old: usize, new: usize, len: usize) -> Result<(), Self::Error> {\n let old = old * self.window;\n let new = self.b[new].start();\n let len = (len * self.window).min(self.old_len - old);\n self.d.equal(old, new, len)\n }\n fn delete(&mut self, old: usize, len: usize, new: usize) -> Result<(), Self::Error> {\n let old = old * self.window;\n let new = self.b[new].start();\n let len = (len * self.window).min(self.old_len - old);\n self.d.delete(old, len, new)\n }\n fn insert(&mut self, old: usize, new: usize, new_len: usize) -> Result<(), Self::Error> {\n let old = old * self.window;\n let new = self.b[new].start();\n let mut new_len_ = 0;\n for b in &self.b[new .. new + new_len] {\n match b {\n Chunk::Old { start, .. } => {\n new_len_ += self.window.min(self.old_len - start)\n }\n Chunk::New { len, .. } => {\n new_len_ += len\n }\n }\n }\n self.d.insert(old, new, new_len_)\n }\n fn replace(\n &mut self,\n old: usize,\n old_len: usize,\n new: usize,\n new_len: usize,\n ) -> Result<(), Self::Error> {\n let old = old * self.window;\n let old_len = (old_len * self.window).min(self.old_len - old);\n let new = self.b[new].start();\n let mut new_len_ = 0;\n for b in &self.b[new .. new + new_len] {\n match b {\n Chunk::Old { start, .. } => {\n new_len_ += self.window.min(self.old_len - start)\n }\n Chunk::New { len, .. } => {\n new_len_ += len\n }\n }\n }\n self.d.replace(old, old_len, new, new_len_)\n }\n fn finish(&mut self) -> Result<(), Self::Error> {\n self.d.finish()\n }\n}\n */\n"}]}}],"owner":"irevoire","repo":"pijul","token":"kbhdvojKdHr4ZqQx6rHDpSb6KGVePXxIyUEuDDGUUzQ=","login":null}

…

Dependencies

Change contents