chore: rename native_model feature

vincent-herlemont · Nov 1, 2023 · ca9d6cc · ca9d6cc
1 parent ab68293
commit ca9d6cc
Show file tree

Hide file tree

Showing 26 changed files with 46 additions and 46 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -25,7 +25,7 @@ bincode = { version = "2.0.0-rc.3", features = ["serde"] }
 
 # Optional tokio support
 tokio = { version = "1", features = ["sync"], optional = true }
-native_model = { path = "../native_model", optional = true }
+native_model_dep = { package = "native_model", path = "../native_model", optional = true }
 
 [dev-dependencies]
 assert_fs = "1.0"
@@ -36,7 +36,7 @@ tokio = { version = "1.33", features = ["test-util","macros"] }
 
 [features]
 default = []
-use_native_model = ["native_model", "struct_db_macro/use_native_model"]
+native_model = ["native_model_dep", "struct_db_macro/native_model"]
 
 [build-dependencies]
 skeptic = "0.13"
diff --git a/src/db.rs b/src/db.rs
@@ -72,7 +72,7 @@ impl Db {
         let mut primary_table_definition: PrimaryTableDefinition =
             (schema.clone(), main_table_definition).into();
 
-        #[cfg(feature = "use_native_model")]
+        #[cfg(feature = "native_model")]
         {
             primary_table_definition.native_model_id = T::native_model_id();
             primary_table_definition.native_model_version = T::native_model_version();
@@ -114,7 +114,7 @@ impl Db {
         Ok(())
     }
 
-    #[cfg(feature = "use_native_model")]
+    #[cfg(feature = "native_model")]
     pub fn migrate<T: SDBItem + Debug>(&mut self) -> Result<()> {
         use redb::ReadableTable;
 

diff --git a/src/item.rs b/src/item.rs
@@ -1,4 +1,4 @@
-#[cfg(not(feature = "use_native_model"))]
+#[cfg(not(feature = "native_model"))]
 pub trait SDBItem: Sized {
     fn struct_db_schema() -> crate::Schema;
     fn struct_db_primary_key(&self) -> Vec<u8>;
@@ -17,7 +17,7 @@ pub trait SDBItem: Sized {
     }
 }
 
-#[cfg(feature = "use_native_model")]
+#[cfg(feature = "native_model")]
 pub trait SDBItem: Sized + native_model::Model {
     fn struct_db_schema() -> crate::Schema;
     fn struct_db_primary_key(&self) -> Vec<u8>;

diff --git a/src/serialization.rs b/src/serialization.rs
@@ -1,28 +1,27 @@
-
-#[cfg(not(feature = "use_native_model"))]
+#[cfg(not(feature = "native_model"))]
 pub fn bincode_encode_to_vec<T>(value: &T) -> Option<Vec<u8>>
 where
     T: serde::Serialize,
 {
     bincode::serde::encode_to_vec(value, bincode::config::standard()).ok()
 }
-#[cfg(feature = "use_native_model")]
+#[cfg(feature = "native_model")]
 pub fn bincode_encode_to_vec<T>(value: &T) -> Option<Vec<u8>>
 where
     T: serde::Serialize + native_model::Model,
 {
     native_model::encode(value).ok()
 }
 
-#[cfg(not(feature = "use_native_model"))]
+#[cfg(not(feature = "native_model"))]
 pub fn bincode_decode_from_slice<T>(slice: &[u8]) -> Option<(T, usize)>
 where
     T: serde::de::DeserializeOwned,
 {
-        bincode::serde::decode_from_slice(slice, bincode::config::standard()).ok()
+    bincode::serde::decode_from_slice(slice, bincode::config::standard()).ok()
 }
 
-#[cfg(feature = "use_native_model")]
+#[cfg(feature = "native_model")]
 pub fn bincode_decode_from_slice<T>(slice: &[u8]) -> Option<(T, usize)>
 where
     T: serde::de::DeserializeOwned + native_model::Model,

diff --git a/src/table_definition.rs b/src/table_definition.rs
@@ -3,14 +3,14 @@ use redb::TableHandle;
 use std::collections::HashMap;
 use std::fmt::Debug;
 
-#[cfg(not(feature = "use_native_model"))]
+#[cfg(not(feature = "native_model"))]
 pub(crate) struct PrimaryTableDefinition {
     pub(crate) schema: crate::Schema,
     pub(crate) redb: redb::TableDefinition<'static, &'static [u8], &'static [u8]>,
     pub(crate) secondary_tables: HashMap<&'static str, SecondaryTableDefinition>,
 }
 
-#[cfg(feature = "use_native_model")]
+#[cfg(feature = "native_model")]
 pub(crate) struct PrimaryTableDefinition {
     pub(crate) schema: crate::Schema,
     pub(crate) redb: redb::TableDefinition<'static, &'static [u8], &'static [u8]>,
@@ -29,7 +29,7 @@ impl
         redb::TableDefinition<'static, &'static [u8], &'static [u8]>,
     )> for PrimaryTableDefinition
 {
-    #[cfg(not(feature = "use_native_model"))]
+    #[cfg(not(feature = "native_model"))]
     fn from(
         input: (
             schema::Schema,
@@ -44,7 +44,7 @@ impl
         }
     }
 
-    #[cfg(feature = "use_native_model")]
+    #[cfg(feature = "native_model")]
     fn from(
         input: (
             schema::Schema,
@@ -63,7 +63,7 @@ impl
     }
 }
 
-#[cfg(feature = "use_native_model")]
+#[cfg(feature = "native_model")]
 impl Debug for PrimaryTableDefinition {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("TableDefinition")
@@ -75,7 +75,7 @@ impl Debug for PrimaryTableDefinition {
     }
 }
 
-#[cfg(not(feature = "use_native_model"))]
+#[cfg(not(feature = "native_model"))]
 impl Debug for PrimaryTableDefinition {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         f.debug_struct("TableDefinition")

diff --git a/struct_db_macro/Cargo.toml b/struct_db_macro/Cargo.toml
@@ -18,4 +18,4 @@ quote = "1.0"
 
 [features]
 default = []
-use_native_model = []
+native_model = []
diff --git a/struct_db_macro/src/struct_db.rs b/struct_db_macro/src/struct_db.rs
@@ -88,11 +88,11 @@ pub fn struct_db(args: TokenStream, input: TokenStream) -> TokenStream {
             }
         });
 
-    #[cfg(feature = "use_native_model")]
+    #[cfg(feature = "native_model")]
     let is_native_model_exists = quote! {
         true
     };
-    #[cfg(not(feature = "use_native_model"))]
+    #[cfg(not(feature = "native_model"))]
     let is_native_model_exists = quote! {
         false
     };

diff --git a/tests/00_bincode.rs b/tests/00_bincode.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/01_fn_primary_key.rs b/tests/01_fn_primary_key.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/02_simple_insert.rs b/tests/02_simple_insert.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/03_simple_insert_get.rs b/tests/03_simple_insert_get.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/04_simple_len.rs b/tests/04_simple_len.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/05_update.rs b/tests/05_update.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/06_transaction.rs b/tests/06_transaction.rs
@@ -1,8 +1,8 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
-use std::panic::AssertUnwindSafe;
 use serde::{Deserialize, Serialize};
+use std::panic::AssertUnwindSafe;
 use struct_db::*;
 
 #[derive(Serialize, Deserialize, Eq, PartialEq, Debug, Clone)]

diff --git a/tests/07_simple_multithreads.rs b/tests/07_simple_multithreads.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/08_fn_key.rs b/tests/08_fn_key.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/09_iterator.rs b/tests/09_iterator.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/10_remove.rs b/tests/10_remove.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/11_watch.rs b/tests/11_watch.rs
@@ -1,8 +1,7 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 #![cfg(not(feature = "tokio"))]
 mod tests;
 
-
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 use std::time::Duration;

diff --git a/tests/11_watch_tokio.rs b/tests/11_watch_tokio.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 #![cfg(feature = "tokio")]
 mod tests;
 
@@ -59,4 +59,4 @@ async fn watch_one_primary_key() {
     assert!(recv.try_recv().is_err());
 }
 
-// TODO: maybe do others tests but it should the same as a std::sync::mpsc::channel.
+// TODO: maybe do others tests but it should the same as a std::sync::mpsc::channel.
diff --git a/tests/12_migration.rs b/tests/12_migration.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use serde::{Deserialize, Serialize};

diff --git a/tests/13_util.rs b/tests/13_util.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 mod tests;
 
 use struct_db::*;
@@ -14,10 +14,12 @@ fn test_builder() {
 fn test_builder_with_set_cache_size() {
     let tf = tests::init();
     // Create without error
-    let mut _db = Builder::new().set_cache_size(100).create(&tf.path("test")).unwrap();
+    let mut _db = Builder::new()
+        .set_cache_size(100)
+        .create(&tf.path("test"))
+        .unwrap();
 }
 
-
 #[test]
 fn test_open_unexisting_database() {
     let tf = tests::init();
@@ -30,7 +32,7 @@ fn test_open_existing_database() {
     let tf = tests::init();
 
     // Create a database
-    let  db = Builder::new().create(&tf.path("test")).unwrap();
+    let db = Builder::new().create(&tf.path("test")).unwrap();
     drop(db);
 
     // Open an existing database

diff --git a/tests/14_native_model.rs b/tests/14_native_model.rs
@@ -1,4 +1,4 @@
-#![cfg(feature = "use_native_model")]
+#![cfg(feature = "native_model")]
 
 mod tests;
 

diff --git a/tests/modules.rs b/tests/modules.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "use_native_model")]
+#[cfg(feature = "native_model")]
 mod migrate;
 
 mod primary_drain;
diff --git a/tests/primary_drain/only_primary_key.rs b/tests/primary_drain/only_primary_key.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 
 use serde::{Deserialize, Serialize};
 use shortcut_assert_fs::TmpFs;

diff --git a/tests/primary_drain/with_secondary_keys.rs b/tests/primary_drain/with_secondary_keys.rs
@@ -1,4 +1,4 @@
-#![cfg(not(feature = "use_native_model"))]
+#![cfg(not(feature = "native_model"))]
 
 use redb::TableHandle;
 use serde::{Deserialize, Serialize};