Merge pull request khonsulabs#286 from ModProg/key-lifetime

Lifetime for `#[derive(Key)]`

Author: ecton

crates/bonsaidb-macros/Cargo.toml

@@ -16,13 +16,13 @@ rust-version = "1.65"
 proc-macro = true
 
 [dependencies]
-attribute-derive = "0.3.1"
+attribute-derive = "0.6.0"
 proc-macro-crate = "1.1.0"
 proc-macro-error = "1"
 proc-macro2 = { version = "1.0.37", features = ["nightly"] }
 quote = "1"
-quote-use = { version = "0.6.0", features = ["namespace_idents"] }
-syn = "1"
+quote-use = { version = "0.7.0", features = ["namespace_idents"] }
+syn = "2"
 trybuild = "1.0.54"
 
 [dev-dependencies]

crates/bonsaidb-macros/src/lib.rs

@@ -1,3 +1,5 @@
+use std::borrow::Cow;
+
 use bonsaidb::core::key::{Key, KeyEncoding};
 
 #[test]
@@ -125,3 +127,17 @@ fn enum_u64() {
         &[255, 255, 255, 255, 255, 255, 255, 255]
     );
 }
+
+#[test]
+fn lifetime() {
+    #[derive(Clone, Debug, Key)]
+    struct Test<'a, 'b>(Cow<'a, str>, Cow<'b, str>);
+
+    assert_eq!(
+        &[97, 0, 98, 0, 1, 1],
+        Test("a".into(), "b".into())
+            .as_ord_bytes()
+            .unwrap()
+            .as_ref()
+    )
+}

crates/bonsaidb-macros/tests/key.rs

@@ -4,7 +4,7 @@ error: expected identifier
 4 | #[collection(name = "hi", authority = "hello", "hi")]
   |                                                ^^^^
 
-error: Only `authority = \"some-authority\"`, `name = \"some-name\"`, `views = [SomeView, AnotherView]`, `primary_key = u64`, `natural_id = |contents: &Self| Some(contents.id)`, serialization = SerializationFormat` and `core = bonsaidb::core` are supported attributes
+error: supported fields are `authority`, `name`, `views`, `serialization`, `encryption_key`, `encryption_required`, `encryption_optional`, `primary_key`, `natural_id` and `core`
  --> tests/ui/collection/invalid_attribute.rs:8:48
   |
 8 | #[collection(name = "hi", authority = "hello", field = 200)]

crates/bonsaidb-macros/tests/ui/collection/invalid_attribute.stderr

@@ -1,4 +1,6 @@
-error: You need to specify the collection name via `#[collection(name = \"name\")]`
+error: required `name` is not specified
+
+       = help: try `#[collection(name="name")]`
  --> tests/ui/collection/missing_name.rs:3:10
   |
 3 | #[derive(Collection)]

crates/bonsaidb-macros/tests/ui/collection/missing_name.stderr

@@ -4,7 +4,7 @@ error: expected identifier
 5 | #[schema(name = "name", "hi")]
   |                         ^^^^
 
-error: Only `name = \"name\"`, `authority = \"authority\"`, `collections = [SomeCollection, AnotherCollection]`, `include = [OtherSchema]`, and `core = bonsaidb::core` are supported attributes
+error: supported fields are `name`, `authority`, `collections`, `include` and `core`
  --> tests/ui/schema/invalid_attribute.rs:9:25
   |
 9 | #[schema(name = "name", test = "hi")]

crates/bonsaidb-macros/tests/ui/schema/invalid_attribute.stderr

@@ -1,4 +1,6 @@
-error: You need to specify the schema name via `#[schema(name = \"name\")]`
+error: required `name` is not specified
+
+       = help: try `#[schema(name="name")]`
  --> tests/ui/schema/missing_name.rs:3:10
   |
 3 | #[derive(Schema)]

crates/bonsaidb-macros/tests/ui/schema/missing_name.stderr

@@ -4,7 +4,7 @@ error: expected identifier
 4 | #[view(name = "hi", "hi")]
   |                     ^^^^
 
-error: Only `collection = CollectionType`, `key = KeyType`, `name = \"by-name\"`, `value = ValueType` and `serialization = SerializationFormat` and `core = bonsaidb::core` are supported attributes
+error: supported fields are `collection`, `key`, `name`, `value`, `core` and `serialization`
  --> tests/ui/view/invalid_attribute.rs:8:21
   |
 8 | #[view(name = "hi", authority = "hello", "hi")]

crates/bonsaidb-macros/tests/ui/view/invalid_attribute.stderr

@@ -1,4 +1,6 @@
-error: You need to specify the collection type via `#[view(collection = CollectionType)]`
+error: required `collection` is not specified
+
+       = help: try `#[view(collection=CollectionType)]`
  --> tests/ui/view/missing_collection.rs:3:10
   |
 3 | #[derive(View)]

crates/bonsaidb-macros/tests/ui/view/missing_collection.stderr

@@ -1,4 +1,6 @@
-error: You need to specify the key type via `#[view(key = KeyType)]`
+error: required `key` is not specified
+
+       = help: try `#[view(key=KeyType)]`
  --> tests/ui/view/missing_key.rs:3:10
   |
 3 | #[derive(View)]