pijul/sanakirja - Change YATBB4O7MHKUVYI2JKIYPHLFJIAPK7UPJWAXHR26VVJPIYAOK66AC

run cargo fmt

Created by 9FZSPF6U3oQmpTwxvCnadrHKQEqTkEpnrDg1UWw9Zo9E on October 25, 2021

YATBB4O7MHKUVYI2JKIYPHLFJIAPK7UPJWAXHR26VVJPIYAOK66AC

Dependencies

In discussions

#5 make rc overflow an error variant

Change contents

Replacement in "sanakirja-core/src/lib.rs" at line 258 [10.91]

∅:D[7.192] → [9.346:401]

B:BD[9.346] → [9.346:401]

B:BD[9.401] → [5.119:153]

∅:D[5.153] → [9.438:485]

B:BD[9.438] → [9.438:485]

            hasher.update(core::slice::from_raw_parts(
                self.data.add(8),
                PAGE_SIZE - 8,
            ));

[7.192]

[11.116]

            hasher.update(core::slice::from_raw_parts(self.data.add(8), PAGE_SIZE - 8));

Replacement in "sanakirja-core/src/btree/page_unsized.rs" at line 153 [14.2014]

B:BD[12.4811] → [13.1103:1206]

            let off = unsafe { *(page.data.as_ptr().offset(HDR as isize + c.cur * 8) as *const u64) };

[12.4811]

[12.4911]

            let off =
                unsafe { *(page.data.as_ptr().offset(HDR as isize + c.cur * 8) as *const u64) };

Replacement in "sanakirja-core/src/btree/page_unsized.rs" at line 341 [14.2014]

B:BD[14.4585] → [15.0:51]

B:BD[15.51] → [16.0:30]

∅:D[16.30] → [15.77:133]

B:BD[15.77] → [15.77:133]

    unsafe fn put_mut(
        page: &mut MutPage,
        c: &mut Self::Cursor,
        k0: &K,
        v0: &V,
        r: u64,
    ) {

[14.4585]

[15.133]

    unsafe fn put_mut(page: &mut MutPage, c: &mut Self::Cursor, k0: &K, v0: &V, r: u64) {

Replacement in "sanakirja-core/src/btree/page_unsized.rs" at line 351 [14.2014]

B:BD[15.336] → [15.336:443]

    unsafe fn set_left_child(
        page: &mut MutPage,
        c: &Self::Cursor,
        l: u64
    ) {

[15.336]

[15.443]

    unsafe fn set_left_child(page: &mut MutPage, c: &Self::Cursor, l: u64) {

Replacement in "sanakirja-core/src/btree/page_unsized.rs" at line 652 [14.2014]

B:BD[12.18046] → [17.0:128]

fn modify<T: LoadPage, K: core::fmt::Debug + ?Sized, V: core::fmt::Debug + ?Sized, P: BTreeMutPage<K, V>, L: AllocWrite<K, V>>(

[12.18046]

[14.19129]

fn modify<
    T: LoadPage,
    K: core::fmt::Debug + ?Sized,
    V: core::fmt::Debug + ?Sized,
    P: BTreeMutPage<K, V>,
    L: AllocWrite<K, V>,
>(

Replacement in "sanakirja-core/src/btree/page.rs" at line 222 [10.8623]

∅:D[18.8675] → [19.4966:4988]

B:BD[19.4966] → [19.4966:4988]

B:BD[19.4988] → [5.910:1013]

            let off =
                unsafe { *(page.data.as_ptr().offset((HDR as isize + c.cur * 8) - 8) as *const u64) };

[18.8675]

[19.5088]

            let off = unsafe {
                *(page.data.as_ptr().offset((HDR as isize + c.cur * 8) - 8) as *const u64)
            };

Replacement in "sanakirja-core/src/btree/page/rebalance.rs" at line 53 [21.387]

B:BD[20.5130] → [20.5130:5281]

        if let Put::Ok(Ok { page, freed }) = <Page<K, V>>::put(
            txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,
        )? {

[20.5130]

[22.270]

        if let Put::Ok(Ok { page, freed }) =
            <Page<K, V>>::put(txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl)?
        {

Replacement in "sanakirja-core/src/btree/page/rebalance.rs" at line 86 [21.387]

B:BD[20.5664] → [20.5664:5815]

        if let Put::Ok(Ok { page, freed }) = <Page<K, V>>::put(
            txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl,
        )? {

[20.5664]

[22.592]

        if let Put::Ok(Ok { page, freed }) =
            <Page<K, V>>::put(txn, page.0, true, false, &lc, m.mid.0, m.mid.1, None, 0, rl)?
        {

Replacement in "sanakirja-core/src/btree/page/rebalance.rs" at line 105 [21.387]

B:BD[20.6090] → [20.6090:6187]

            txn, m.modified.page, m.modified.mutable, false, &lc, m.mid.0, m.mid.1, None, 0, rl,

[20.6090]

[20.6187]

            txn,
            m.modified.page,
            m.modified.mutable,
            false,
            &lc,
            m.mid.0,
            m.mid.1,
            None,
            0,
            rl,

Replacement in "sanakirja-core/src/btree/mod.rs" at line 184 [10.45735]

B:BD[15.1408] → [15.1408:1459]

B:BD[15.1459] → [16.108:138]

∅:D[16.138] → [15.1485:1533]

B:BD[15.1485] → [15.1485:1533]

B:BD[15.1533] → [5.2473:2480]

    unsafe fn put_mut(
        page: &mut MutPage,
        c: &mut Self::Cursor,
        k0: &K,
        v0: &V,
        r: u64,
    );

[15.1408]

[15.1572]

    unsafe fn put_mut(page: &mut MutPage, c: &mut Self::Cursor, k0: &K, v0: &V, r: u64);

Replacement in "sanakirja-core/src/btree/mod.rs" at line 187 [10.45735]

B:BD[15.1604] → [15.1604:1703]

B:BD[15.1703] → [5.2481:2488]

    unsafe fn set_left_child(
        page: &mut MutPage,
        c: &Self::Cursor,
        l: u64
    );

[15.1604]

[15.1742]

    unsafe fn set_left_child(page: &mut MutPage, c: &Self::Cursor, l: u64);

Deletion in "sanakirja-core/src/btree/mod.rs" at line 189 [10.45735]
B:BD[15.1743] → [15.1743:1744]

Replacement in "sanakirja-core/src/btree/del.rs" at line 195 [10.52511]

B:BD[23.15103] → [13.7132:7233]

        last_op = handle_merge(txn, cursor, p0, &k0v0, incr_page, incr_mid, mil, merge, &mut free)?;

[23.15103]

[24.8567]

        last_op = handle_merge(
            txn, cursor, p0, &k0v0, incr_page, incr_mid, mil, merge, &mut free,
        )?;

Replacement in "sanakirja-core/src/btree/del.rs" at line 383 [10.52511]

B:BD[2.360] → [2.360:439]

    mod_is_left: bool,    // The modified page in the `merge` is the left one.

[2.360]

[2.439]

    mod_is_left: bool, // The modified page in the `merge` is the left one.

Replacement in "sanakirja-core/src/btree/del.rs" at line 411 [10.52511]

B:BD[13.7600] → [13.7600:7654]

        Op::Merged {.. } | Op::Rebalanced { .. } => {

[13.7600]

[13.7654]

        Op::Merged { .. } | Op::Rebalanced { .. } => {

Replacement in "sanakirja-core/src/btree/del.rs" at line 459 [10.52511]

B:BD[21.35183] → [25.4764:4868]

B:BD[25.4892] → [25.4892:4907]

        Op::Rebalanced {
            k,
            v,
            l,
            r,
            freed,
        } => {

[21.35183]

[21.35233]

        Op::Rebalanced { k, v, l, r, freed } => {

Replacement in "sanakirja-core/src/btree/cursor.rs" at line 205 [10.63682]

∅:D[18.40742] → [26.11211:11288]

B:BD[10.67642] → [26.11211:11288]

B:BD[26.11288] → [13.9302:9334]

    pub fn set_last<'a, T: LoadPage>(
        &mut self,
        txn: &'a T,
    ) -> Result<(), T::Error> {

[18.40742]

[23.19537]

    pub fn set_last<'a, T: LoadPage>(&mut self, txn: &'a T) -> Result<(), T::Error> {

Replacement in "sanakirja-core/src/btree/cursor.rs" at line 238 [10.63682]
B:BD[13.10133] → [13.10133:10165]
```
                return Ok(None)
```
[13.10133]
[13.10165]
```
                return Ok(None);
```

Replacement in "sanakirja-core/src/btree/cursor.rs" at line 271 [10.63682]

B:BD[6.409] → [6.409:530]

                let (cur_entry, r) = if let Some((k, v, r)) = P::current(txn, current.page.as_page(), &current.cursor) {

[6.409]

[6.530]

                let (cur_entry, r) = if let Some((k, v, r)) =
                    P::current(txn, current.page.as_page(), &current.cursor)
                {

Replacement in "sanakirja-core/src/btree/cursor.rs" at line 276 [10.63682]

B:BD[6.593] → [6.593:677]

                    (None, P::right_child(current.page.as_page(), &current.cursor))

[6.593]

[6.677]

                    (
                        None,
                        P::right_child(current.page.as_page(), &current.cursor),
                    )

Deletion in "sanakirja/src/tests.rs" at line 48 [27.11]
B:BD[13.10882] → [13.10882:10883]
Deletion in "sanakirja/src/tests.rs" at line 159 [27.11]
B:BD[13.14645] → [13.14645:14647]
Deletion in "sanakirja/src/tests.rs" at line 229 [27.11]
B:BD[13.17101] → [13.17101:17102]

Replacement in "sanakirja/src/tests.rs" at line 242 [27.11]

B:BD[13.17355] → [13.17355:17462]

    let mut db = create_db_::<MutTxn<&Env, ()>, U, V, btree::page_unsized::Page<U, V>>(&mut txn).unwrap();

[13.17355]

[13.17462]

    let mut db =
        create_db_::<MutTxn<&Env, ()>, U, V, btree::page_unsized::Page<U, V>>(&mut txn).unwrap();

Deletion in "sanakirja/src/tests.rs" at line 310 [27.11]
B:BD[9.2560] → [13.19602:19605]
Deletion in "sanakirja/src/tests.rs" at line 311 [27.11]
B:BD[13.19606] → [13.19606:19607]
∅:D[9.2560] → [27.978:979]
∅:D[13.19607] → [27.978:979]
∅:D[28.25573] → [27.978:979]
B:BD[27.978] → [27.978:979]

Replacement in "sanakirja/src/lib.rs" at line 107 [10.79574]

B:BD[9.2997] → [4.0:67]

∅:D[4.67] → [15.2260:2378]

B:BD[29.6634] → [15.2260:2378]

pub use environment::{Commit, Env, MutTxn, RootDb, Txn, RootPage};
pub use sanakirja_core::{btree, direct_repr, LoadPage, AllocPage, Storable, UnsizedStorable, MutPage, CowPage, Page};

[9.2997]

[30.312]

pub use environment::{Commit, Env, MutTxn, RootDb, RootPage, Txn};
pub use sanakirja_core::{
    btree, direct_repr, AllocPage, CowPage, LoadPage, MutPage, Page, Storable, UnsizedStorable,
};

Replacement in "sanakirja/src/environment/muttxn.rs" at line 52 [10.80166]

B:BD[3.39] → [3.39:119]

  /// Borrow env
  pub fn env_borrow(&self) -> &Env {
    self.env.borrow()
  }

[3.39]

[3.119]

    /// Borrow env
    pub fn env_borrow(&self) -> &Env {
        self.env.borrow()
    }

Replacement in "sanakirja/src/environment/muttxn.rs" at line 500 [10.80166]

B:BD[10.89127] → [15.2424:2478]

            debug!("incr rc 0x{:x} {:?}", off, rc+1);

[10.89127]

[29.19176]

            debug!("incr rc 0x{:x} {:?}", off, rc + 1);

Insertion in "sanakirja/src/environment/mod.rs" at line 9 [10.91606]
[31.1301]
[31.1301]
```
use log::*;
```
Deletion in "sanakirja/src/environment/mod.rs" at line 18 [10.91606]
B:BD[31.1533] → [13.20092:20104]
```
use log::*;
```

Replacement in "sanakirja/src/environment/mod.rs" at line 352 [10.91606]

B:BD[10.104214] → [13.20241:20369]

                info!("find_offset, i = {:?}/{:?}, extending, offset = {:?}, length0 = {:?}", i, mmaps.len(), offset, length0);

[10.104214]

[17.246]

                info!(
                    "find_offset, i = {:?}/{:?}, extending, offset = {:?}, length0 = {:?}",
                    i,
                    mmaps.len(),
                    offset,
                    length0
                );

Deletion in "sanakirja/src/environment/mod.rs" at line 468 [10.91606]
B:BD[3.126] → [3.126:127]

Replacement in "sanakirja/src/environment/mod.rs" at line 469 [10.91606]

B:BD[3.157] → [3.157:237]

  /// Borrow env
  pub fn env_borrow(&self) -> &Env {
    self.env.borrow()
  }

[3.157]

[10.105581]

    /// Borrow env
    pub fn env_borrow(&self) -> &Env {
        self.env.borrow()
    }

Replacement in "sanakirja/src/environment/mod.rs" at line 630 [10.91606]

B:BD[15.2848] → [15.2848:2965]

              .ptr
              .add(self.root * PAGE_SIZE + GLOBAL_HEADER_SIZE + 8 * n)
              as *mut u64)

[15.2848]

[32.18025]

                .ptr
                .add(self.root * PAGE_SIZE + GLOBAL_HEADER_SIZE + 8 * n) as *mut u64)

Replacement in "sanakirja/src/debug.rs" at line 205 [35.11]

B:BD[33.4354] → [34.85:227]

pub fn add_refs<T: LoadPage, K: Storable + Ord + ?Sized + std::fmt::Debug, V: Storable + Ord + ?Sized + std::fmt::Debug, P: BTreePage<K, V>>(

[33.4354]

[33.4448]

pub fn add_refs<
    T: LoadPage,
    K: Storable + Ord + ?Sized + std::fmt::Debug,
    V: Storable + Ord + ?Sized + std::fmt::Debug,
    P: BTreePage<K, V>,
>(

Replacement in "sanakirja/src/debug.rs" at line 216 [35.11]
B:BD[34.260] → [34.260:290]
```
    T::Error: std::fmt::Debug
```
[34.260]
[34.290]
```
    T::Error: std::fmt::Debug,
```

Replacement in "sanakirja/src/debug.rs" at line 238 [35.11]

B:BD[34.731] → [34.731:819]

                            panic!("{:?} {:?} {:?} {:?} {:?}", kv, k_, v_, k_>k, v_>v);

[34.731]

[34.819]

                            panic!("{:?} {:?} {:?} {:?} {:?}", kv, k_, v_, k_ > k, v_ > v);

Replacement in "sanakirja/src/debug.rs" at line 293 [35.11]

B:BD[8.6263] → [8.6263:6396]

pub fn check_refs<B: std::borrow::Borrow<crate::Env>, T>(txn: &crate::MutTxn<B, T>, refs: &std::collections::BTreeMap<u64, usize>) {

[8.6263]

[8.6396]

pub fn check_refs<B: std::borrow::Borrow<crate::Env>, T>(
    txn: &crate::MutTxn<B, T>,
    refs: &std::collections::BTreeMap<u64, usize>,
) {