ilyagr/pijul - Change HL3VKIZF574C3RLSDQPL275KYXGXMIFZABFP5PWC5RVW3BDGDX7QC

Formatting

Created by pmeunier on December 30, 2021

HL3VKIZF574C3RLSDQPL275KYXGXMIFZABFP5PWC5RVW3BDGDX7QC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/tag.rs at line 127 [3.6397]

B:BD[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 [3.6397]

B:BD[2.38728] → [2.38728:38851]

∅:D[4.124] → [3.19497:19511]

∅:D[2.38851] → [3.19497:19511]

B:BD[3.19497] → [3.19497:19511]

B:BD[3.19511] → [4.125:150]

∅:D[4.150] → [3.19538:19601]

B:BD[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 [5.48]

B:BD[5.1581] → [6.229:332]

        let header: crate::tag::FileHeader = bincode::deserialize(&off).map_err(TagError::BincodeDe)?;

[5.1581]

[7.2131]

        let header: crate::tag::FileHeader =
            bincode::deserialize(&off).map_err(TagError::BincodeDe)?;

Replacement in libpijul/src/tag/txn.rs at line 63 [5.48]
B:BD[7.2287] → [7.2287:2302]
```
            })
```
[7.2287]
[7.2302]
```
            });
```

Replacement in libpijul/src/tag/txn.rs at line 65 [5.48]

∅:D[7.2312] → [6.332:415]

B:BD[6.332] → [6.332:415]

        let mut ch = OpenTagFile {
            file,
            header
        };

[7.2312]

[6.437]

        let mut ch = OpenTagFile { file, header };

Replacement in libpijul/src/tag/txn.rs at line 90 [5.48]

B:BD[6.767] → [6.767:853]

∅:D[6.853] → [5.2869:2883]

B:BD[5.2869] → [5.2869:2883]

            unsafe {
                p.as_mut_ptr().add((off - off_aligned) as usize)
            }

[6.767]

[6.854]

            unsafe { p.as_mut_ptr().add((off - off_aligned) as usize) }

Replacement in libpijul/src/tag/txn.rs at line 97 [5.48]

B:BD[6.1062] → [6.1062:1173]

            let p = unsafe {
                buf.as_mut_ptr().add((off - off_aligned) as usize)
            };

[6.1062]

[6.1173]

            let p = unsafe { buf.as_mut_ptr().add((off - off_aligned) as usize) };

Replacement in libpijul/src/tag/txn.rs at line 399 [5.48]

B:BD[5.12692] → [7.2313:2335]

B:BD[7.2335] → [2.38953:39094]

    type TagsCursor =
        ::sanakirja::btree::cursor::Cursor<L64, Pair<SerializedMerkle, SerializedMerkle>, P<L64, Pair<SerializedMerkle, SerializedMerkle>>>;

[5.12692]

[7.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 [5.48]
B:BD[7.2726] → [7.2726:2753]
```
            _ => Ok(false)
```
[7.2726]
[5.13093]
```
            _ => Ok(false),
```

Replacement in libpijul/src/tag/txn.rs at line 420 [5.48]

B:BD[5.13339] → [2.39186:39302]

        crate::pristine::Cursor<Self, &'txn Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

[5.13339]

[5.13429]

        crate::pristine::Cursor<
            Self,
            &'txn Self,
            Self::TagsCursor,
            L64,
            Pair<SerializedMerkle, SerializedMerkle>,
        >,

Replacement in libpijul/src/tag/txn.rs at line 446 [5.48]

B:BD[5.14025] → [2.39397:39500]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {

[5.14025]

[5.14102]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>
    {

Replacement in libpijul/src/tag/txn.rs at line 458 [5.48]

B:BD[5.14340] → [2.39520:39623]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {

[5.14340]

[5.14417]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>
    {

Replacement in libpijul/src/tag/txn.rs at line 472 [5.48]

B:BD[5.14675] → [2.39643:39754]

        crate::pristine::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

[5.14675]

[5.14760]

        crate::pristine::Cursor<
            Self,
            &Self,
            Self::TagsCursor,
            L64,
            Pair<SerializedMerkle, SerializedMerkle>,
        >,

Replacement in libpijul/src/tag/txn.rs at line 489 [5.48]

B:BD[5.14973] → [2.39755:39869]

        crate::pristine::RevCursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

[5.14973]

[5.15061]

        crate::pristine::RevCursor<
            Self,
            &Self,
            Self::TagsCursor,
            L64,
            Pair<SerializedMerkle, SerializedMerkle>,
        >,

Replacement in libpijul/src/tag/txn.rs at line 769 [5.48]

B:BD[5.23017] → [2.39964:40080]

        crate::pristine::Cursor<Self, &'txn Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

[5.23017]

[5.23107]

        crate::pristine::Cursor<
            Self,
            &'txn Self,
            Self::TagsCursor,
            L64,
            Pair<SerializedMerkle, SerializedMerkle>,
        >,

Replacement in libpijul/src/tag/txn.rs at line 783 [5.48]

B:BD[5.23298] → [2.40081:40184]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {

[5.23298]

[5.23375]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>
    {

Replacement in libpijul/src/tag/txn.rs at line 791 [5.48]

B:BD[5.23503] → [2.40185:40288]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>> {

[5.23503]

[5.23580]

    ) -> Result<Option<(&L64, &Pair<SerializedMerkle, SerializedMerkle>)>, TxnErr<Self::GraphError>>
    {

Replacement in libpijul/src/tag/txn.rs at line 801 [5.48]

B:BD[5.23728] → [2.40289:40400]

        crate::pristine::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

[5.23728]

[5.23813]

        crate::pristine::Cursor<
            Self,
            &Self,
            Self::TagsCursor,
            L64,
            Pair<SerializedMerkle, SerializedMerkle>,
        >,

Replacement in libpijul/src/tag/txn.rs at line 818 [5.48]

B:BD[5.24038] → [2.40401:40515]

        crate::pristine::RevCursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,

[5.24038]

[5.24126]

        crate::pristine::RevCursor<
            Self,
            &Self,
            Self::TagsCursor,
            L64,
            Pair<SerializedMerkle, SerializedMerkle>,
        >,

Replacement in libpijul/src/pristine/sanakirja.rs at line 947 [8.531056]

B:BD[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 [8.531056]

B:BD[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 [8.531056]

B:BD[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 [8.531056]

B:BD[9.2167] → [2.40879:41014]

∅:D[2.41014] → [10.906:912]

B:BD[10.906] → [10.906:912]

    ) -> Result<super::Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>, TxnErr<Self::GraphError>>
    {

[9.2167]

[9.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 [8.531056]

B:BD[9.2455] → [2.41015:41153]

∅:D[2.41153] → [10.1013:1019]

B:BD[10.1013] → [10.1013:1019]

    ) -> Result<super::RevCursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>, TxnErr<Self::GraphError>>
    {

[9.2455]

[9.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 [8.586748]

B:BD[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 [8.586748]

B:BD[9.3189] → [2.44438:44567]

    ) -> Result<Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>, TxnErr<Self::GraphError>>;

[9.3189]

[9.3315]

    ) -> Result<
        Cursor<Self, &Self, Self::TagsCursor, L64, Pair<SerializedMerkle, SerializedMerkle>>,
        TxnErr<Self::GraphError>,
    >;

Replacement in libpijul/src/pristine/merkle.rs at line 48 [8.638683]

B:BD[10.4407] → [10.4407:4536]

            super::Hash::Blake3(h) => {
                curve25519_dalek::scalar::Scalar::from_bytes_mod_order(*h)
            }

[10.4407]

[10.4536]

            super::Hash::Blake3(h) => curve25519_dalek::scalar::Scalar::from_bytes_mod_order(*h),

Replacement in libpijul/src/changestore/filesystem.rs at line 3 [8.824013]

B:BD[8.824124] → [7.6521:6584]

use crate::pristine::{Base32, ChangeId, Hash, Vertex, Merkle};

[8.824124]

[11.1356]

use crate::pristine::{Base32, ChangeId, Hash, Merkle, Vertex};