Formatting

pmeunier

Dec 30, 2021, 1:54 PM

HL3VKIZF574C3RLSDQPL275KYXGXMIFZABFP5PWC5RVW3BDGDX7QC

Dependencies

• [2] DO2Y5TY5 Tag synchronisation
• [3] C267PHOH Tags: dropping useless Hashes in favour of Merkles
• [4] CQ3FIUY4 Fixing tag corruption
• [5] FDEVV5NG Tag check
• [6] AETYXHGO Using an LruCache instead of a HashMap for loaded pages in a tag
• [7] RRCSHAYZ Formatting
• [8] QL6K2ZM3 Tags
• [9] N3X5YP7P Adding tag/txn.rs, now that the parser allows it
• [10] 5OGOE4VW Store the current channel in the pristine
• [11] RIAA2QKF Making Merkle std::hash::Hash
• [12] SXEYMYF7 Fixing the bad changes in history (unfortunately, by rebooting).
• [13] GHO6DWPI Refactoring iterators
• [14] AAXP2534 Tags: completing the subcommand
• [15] 5MRZLKBH Changing the type of the tags db, to make it identical to remote tags
• [16] TYAKEAJL A better estimate of the maximum number of open patches we can keep (Unix-only at the moment)

Change contents

• replacement in libpijul/src/tag.rs at line 127
  [2.38014]→[2.38014:38149](∅→∅)
  − pub fn read_short<R: std::io::Read + std::io::Seek>(mut file: R, expected: &Merkle) -> Result<crate::change::ChangeHeader, TagError> {
  [2.38014]

  [2.38149]
  + pub fn read_short<R: std::io::Read + std::io::Seek>(

  + mut file: R,

  + expected: &Merkle,

  + ) -> Result<crate::change::ChangeHeader, TagError> {
• replacement in libpijul/src/tag.rs at line 524
  [2.38728]→[2.38728:38851](∅→∅),[3.124]→[3.19497:19511](∅→∅),[2.38851]→[3.19497:19511](∅→∅),[3.19497]→[3.19497:19511](∅→∅),[3.19511]→[3.125:150](∅→∅),[3.150]→[3.19538:19601](∅→∅),[3.19538]→[3.19538:19601](∅→∅)
  − let tags = copy::<L64, Pair<SerializedMerkle, SerializedMerkle>, P<L64, Pair<SerializedMerkle, SerializedMerkle>>, _>(

  − &txn,

  − channel.tags.db,

  − &mut new,

  − &sender,

  − &breceiver,

  − )?;
  [2.38728]

  [3.19601]
  + let tags = copy::<

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + P<L64, Pair<SerializedMerkle, SerializedMerkle>>,

  + _,

  + >(&txn, channel.tags.db, &mut new, &sender, &breceiver)?;
• replacement in libpijul/src/tag/txn.rs at line 57
  [3.1581]→[3.229:332](∅→∅)
  − let header: crate::tag::FileHeader = bincode::deserialize(&off).map_err(TagError::BincodeDe)?;
  [3.1581]

  [3.2131]
  + let header: crate::tag::FileHeader =

  + bincode::deserialize(&off).map_err(TagError::BincodeDe)?;
• replacement in libpijul/src/tag/txn.rs at line 63
  [3.2287]→[3.2287:2302](∅→∅)
  − })
  [3.2287]

  [3.2302]
  + });
• replacement in libpijul/src/tag/txn.rs at line 65
  [3.2312]→[3.332:415](∅→∅),[3.332]→[3.332:415](∅→∅)
  − let mut ch = OpenTagFile {

  − file,

  − header

  − };
  [3.2312]

  [3.437]
  + let mut ch = OpenTagFile { file, header };
• replacement in libpijul/src/tag/txn.rs at line 90
  [3.767]→[3.767:853](∅→∅),[3.853]→[3.2869:2883](∅→∅),[3.2869]→[3.2869:2883](∅→∅)
  − unsafe {

  − p.as_mut_ptr().add((off - off_aligned) as usize)

  − }
  [3.767]

  [3.854]
  + unsafe { p.as_mut_ptr().add((off - off_aligned) as usize) }
• replacement in libpijul/src/tag/txn.rs at line 97
  [3.1062]→[3.1062:1173](∅→∅)
  − let p = unsafe {

  − buf.as_mut_ptr().add((off - off_aligned) as usize)

  − };
  [3.1062]

  [3.1173]
  + let p = unsafe { buf.as_mut_ptr().add((off - off_aligned) as usize) };
• replacement in libpijul/src/tag/txn.rs at line 399
  [3.12692]→[3.2313:2335](∅→∅),[3.2335]→[2.38953:39094](∅→∅)
  − type TagsCursor =

  − ::sanakirja::btree::cursor::Cursor<L64, Pair<SerializedMerkle, SerializedMerkle>, P<L64, Pair<SerializedMerkle, SerializedMerkle>>>;
  [3.12692]

  [3.2400]
  + type TagsCursor = ::sanakirja::btree::cursor::Cursor<

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + P<L64, Pair<SerializedMerkle, SerializedMerkle>>,

  + >;
• replacement in libpijul/src/tag/txn.rs at line 411
  [3.2726]→[3.2726:2753](∅→∅)
  − _ => Ok(false)
  [3.2726]

  [3.13093]
  + _ => Ok(false),
• replacement in libpijul/src/tag/txn.rs at line 420
  [3.13339]→[2.39186:39302](∅→∅)
  − crate::pristine::Cursor<Self, &'txn Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.13339]

  [3.13429]
  + crate::pristine::Cursor<

  + Self,

  + &'txn Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/tag/txn.rs at line 446
  [3.14025]→[2.39397:39500](∅→∅)
  − ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {
  [3.14025]

  [3.14102]
  + ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>

  + {
• replacement in libpijul/src/tag/txn.rs at line 458
  [3.14340]→[2.39520:39623](∅→∅)
  − ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {
  [3.14340]

  [3.14417]
  + ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>

  + {
• replacement in libpijul/src/tag/txn.rs at line 472
  [3.14675]→[2.39643:39754](∅→∅)
  − crate::pristine::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.14675]

  [3.14760]
  + crate::pristine::Cursor<

  + Self,

  + &Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/tag/txn.rs at line 489
  [3.14973]→[2.39755:39869](∅→∅)
  − crate::pristine::RevCursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.14973]

  [3.15061]
  + crate::pristine::RevCursor<

  + Self,

  + &Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/tag/txn.rs at line 769
  [3.23017]→[2.39964:40080](∅→∅)
  − crate::pristine::Cursor<Self, &'txn Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.23017]

  [3.23107]
  + crate::pristine::Cursor<

  + Self,

  + &'txn Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/tag/txn.rs at line 783
  [3.23298]→[2.40081:40184](∅→∅)
  − ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {
  [3.23298]

  [3.23375]
  + ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>

  + {
• replacement in libpijul/src/tag/txn.rs at line 791
  [3.23503]→[2.40185:40288](∅→∅)
  − ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {
  [3.23503]

  [3.23580]
  + ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>

  + {
• replacement in libpijul/src/tag/txn.rs at line 801
  [3.23728]→[2.40289:40400](∅→∅)
  − crate::pristine::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.23728]

  [3.23813]
  + crate::pristine::Cursor<

  + Self,

  + &Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/tag/txn.rs at line 818
  [3.24038]→[2.40401:40515](∅→∅)
  − crate::pristine::RevCursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.24038]

  [3.24126]
  + crate::pristine::RevCursor<

  + Self,

  + &Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/pristine/sanakirja.rs at line 947
  [3.23676]→[2.40516:40632](∅→∅)
  − crate::pristine::Cursor<Self, &'txn Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.23676]

  [3.23766]
  + crate::pristine::Cursor<

  + Self,

  + &'txn Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/pristine/sanakirja.rs at line 971
  [3.24249]→[2.40633:40736](∅→∅)
  − ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {
  [3.24249]

  [3.24326]
  + ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>

  + {
• replacement in libpijul/src/pristine/sanakirja.rs at line 983
  [3.24562]→[2.40756:40859](∅→∅)
  − ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {
  [3.24562]

  [3.24639]
  + ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>

  + {
• replacement in libpijul/src/pristine/sanakirja.rs at line 996
  [3.2167]→[2.40879:41014](∅→∅),[2.41014]→[3.906:912](∅→∅),[3.906]→[3.906:912](∅→∅)
  − ) -> Result<super::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>, TxnErr<Self::GraphError>>

  − {
  [3.2167]

  [3.2301]
  + ) -> Result<

  + super::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

  + TxnErr<Self::GraphError>,

  + > {
• replacement in libpijul/src/pristine/sanakirja.rs at line 1007
  [3.2455]→[2.41015:41153](∅→∅),[2.41153]→[3.1013:1019](∅→∅),[3.1013]→[3.1013:1019](∅→∅)
  − ) -> Result<super::RevCursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>, TxnErr<Self::GraphError>>

  − {
  [3.2455]

  [3.2592]
  + ) -> Result<

  + super::RevCursor<

  + Self,

  + &Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,

  + TxnErr<Self::GraphError>,

  + > {
• replacement in libpijul/src/pristine/mod.rs at line 467
  [3.26829]→[2.44115:44231](∅→∅)
  − crate::pristine::Cursor<Self, &'txn Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
  [3.26829]

  [3.26919]
  + crate::pristine::Cursor<

  + Self,

  + &'txn Self,

  + Self::TagsCursor,

  + L64,

  + Pair<SerializedMerkle, SerializedMerkle>,

  + >,
• replacement in libpijul/src/pristine/mod.rs at line 491
  [3.3189]→[2.44438:44567](∅→∅)
  − ) -> Result<Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>, TxnErr<Self::GraphError>>;
  [3.3189]

  [3.3315]
  + ) -> Result<

  + Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

  + TxnErr<Self::GraphError>,

  + >;
• replacement in libpijul/src/pristine/merkle.rs at line 48
  [3.4407]→[3.4407:4536](∅→∅)
  − super::Hash::Blake3(h) => {

  − curve25519_dalek::scalar::Scalar::from_bytes_mod_order(*h)

  − }
  [3.4407]

  [3.4536]
  + super::Hash::Blake3(h) => curve25519_dalek::scalar::Scalar::from_bytes_mod_order(*h),
• replacement in libpijul/src/changestore/filesystem.rs at line 3
  [3.824124]→[3.6521:6584](∅→∅)
  − use crate::pristine::{Base32, ChangeId, Hash, Vertex, Merkle};
  [3.824124]

  [3.1356]
  + use crate::pristine::{Base32, ChangeId, Hash, Merkle, Vertex};