Solving conflicts

pmeunier

Feb 10, 2024, 4:48 PM

7J4DOODXJL3Z3NFI2BSLGGCY2KSG5SV3ALNFGNV4CE5A6CZHHVGQC

Dependencies

• [2] HMWFIUDS Support for large values + endianness bugs
• [3] WU3RE536 Use $crate in direct_repr macro
• [4] H3FVSQIQ Unsized pages
• [5] 76S6EF7U Changes in the `Storable` trait (write_to_page now takes a transaction)
• [6] KK3SBH4P Adding sanakirja-core-async
• [7] QYDGYIZR Split trait Representable into its mandatory part and an optional part
• [*] OP6SVMOD Resetting history

Change contents

• resurrect zombie in sanakirja-core-async/src/lib.rs at line 83
  [4.3668]→[2.242:278](∅→∅),[4.3668]→[2.242:278](∅→∅)
  + #[async_trait::async_trait]
• resolve order conflict in sanakirja-core-async/src/lib.rs at line 84
  [2.278]

  [3.178]
• resurrect zombie in sanakirja-core-async/src/lib.rs at line 93
  [4.3988]→[2.374:410](∅→∅),[4.3988]→[2.374:410](∅→∅)
  + #[async_trait::async_trait]
• edit in sanakirja-core-async/src/lib.rs at line 93
  [4.3988]

  [2.374]
  +
• resolve order conflict in sanakirja-core-async/src/lib.rs at line 95
  [2.410]

  [3.218]
• edit in sanakirja-core/src/lib.rs at line 138
  [4.897]→[3.87:177](∅→∅),[4.897]→[3.87:177](∅→∅)
  − unsafe fn write_to_page<T: $crate::AllocPage>(&self, _: &mut T, p: *mut u8) {
• resolve order conflict in sanakirja-core/src/lib.rs at line 138
  [2.32610]

  [4.288]