finish refactoring import crate

2 files changed, 9 insertions, 4 deletions

diff --git a/common/object/src/lib.rs b/common/object/src/lib.rs
index 290cf91..5637dd6 100644
--- a/common/object/src/lib.rs
+++ b/common/object/src/lib.rs
@@ -17,7 +17,11 @@ pub use path::*;
 pub use registry::*;
 pub use value::*;
 
-use std::{collections::HashSet, hash::Hash, marker::PhantomData};
+use std::{
+    collections::{BTreeSet, HashSet},
+    hash::Hash,
+    marker::PhantomData,
+};
 
 #[repr(transparent)]
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
@@ -150,7 +154,7 @@ impl<'a> Object<'a> {
         }
     }
     #[must_use]
-    pub fn extend<T: Value<'a> + Hash + Eq + PartialEq>(
+    pub fn extend<T: Value<'a> + Eq + Ord>(
         &self,
         tag: TypedTag<T>,
         values: impl IntoIterator<Item = T>,
@@ -160,7 +164,7 @@ impl<'a> Object<'a> {
             &self
                 .iter(tag)
                 .chain(values)
-                .collect::<HashSet<_>>()
+                .collect::<BTreeSet<_>>()
                 .into_iter()
                 .collect::<Vec<_>>(),
         )
diff --git a/common/src/lib.rs b/common/src/lib.rs
index cc11c58..e5531f4 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -19,7 +19,7 @@ pub static TAGREG: LazyLock<Registry> = LazyLock::new(|| {
 });
 
 fields! {
-    // Tag counter: 38
+    // Tag counter: 39
 
     NO_KIND: Tag = 1 "kind";
     NO_TITLE: &str = 2 "title";
@@ -40,6 +40,7 @@ fields! {
     NO_VISIBILITY: Tag = 14 "visibility";
     NO_STORAGE_SIZE: u64 = 15 "storage_size";
     NO_CREDIT: Object = 33 "credit"; // multi
+    NO_SLUG: &str = 37 "slug";
 
     CR_NODE: u64 = 34 "node";
     CR_KIND: Tag = 35 "kind";