Merge pull request #61 from johanhelsing/bevy-0.15

Bevy 0.15, redb 2

Author: johanhelsing

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ name: ci
 
 jobs:
   check-default:
-    name: Check default (sled)
+    name: Check default (redb)
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -44,7 +44,7 @@ jobs:
         run: cargo check --all-targets --no-default-features --features rocksdb
 
   check-redb:
-    name: Check redb
+    name: Check sled
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -59,7 +59,7 @@ jobs:
         uses: Swatinem/rust-cache@v2
 
       - name: Check
-        run: cargo check --all-targets --no-default-features --features redb
+        run: cargo check --all-targets --no-default-features --features sled
 
   check-wasm:
     name: Check wasm

Cargo.toml

@@ -10,9 +10,9 @@ categories = ["game-development"]
 repository = "https://github.com/johanhelsing/bevy_pkv"
 
 [dependencies]
-thiserror = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-bevy_ecs = { version = "0.14", optional = true }   # we need for deriving Resource in PkvStore
+thiserror = "2"
+serde = { version = "1", features = ["derive"] }
+bevy_ecs = { version = "0.15", optional = true }   # we need for deriving Resource in PkvStore
 
 [features]
 default = ["bevy", "redb"]
@@ -27,17 +27,17 @@ web-sys = { version = "0.3", default-features = false, features = [
     "Window",
 ] }
 wasm-bindgen = { version = "0.2", default-features = false }
-serde_json = "1.0"
+serde_json = "1"
 
 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 rocksdb = { version = "0.22", optional = true }
 sled = { version = "0.34", optional = true }
 rmp-serde = "1.1"
 directories = "5.0"
-redb = { version = "1.5", optional = true }
+redb = { version = "2.2", optional = true }
 
 [dev-dependencies]
-bevy = { version = "0.14", default-features = false }
+bevy = { version = "0.15", default-features = false }
 strum_macros = "0.26"
 tempfile = "3"
 

src/path.rs

@@ -1,7 +1,7 @@
 use crate::Location;
 use std::path::Path;
 
-impl<'a> Location<'a> {
+impl Location<'_> {
     pub fn get_path(&self) -> std::path::PathBuf {
         match self {
             Self::CustomPath(path) => path.to_path_buf(),

src/redb_store.rs

@@ -1,5 +1,5 @@
 use crate::{Location, StoreImpl};
-use redb::{Database, ReadableTable, TableDefinition};
+use redb::{Database, TableDefinition};
 use serde::{de::DeserializeOwned, Serialize};
 use std::fmt::{Debug, Formatter};
 pub struct ReDbStore {