save

xiyuzhai-husky-lang · Nov 30, 2023 · f4c2b39 · f4c2b39
1 parent 7f3cec7
commit f4c2b39
Show file tree

Hide file tree

Showing 35 changed files with 3,140 additions and 3,698 deletions.
diff --git a/crates/abstractions/vec-like/src/lib.rs b/crates/abstractions/vec-like/src/lib.rs
@@ -1,3 +1,4 @@
+#![feature(impl_trait_in_assoc_type)]
 mod append_only;
 pub mod error;
 mod ordered_small_vec_set;

diff --git a/crates/abstractions/vec-like/src/vec_set.rs b/crates/abstractions/vec-like/src/vec_set.rs
@@ -6,6 +6,16 @@ pub struct VecSet<K> {
     data: Vec<K>,
 }
 
+impl<'a, K> IntoIterator for &'a VecSet<K> {
+    type Item = &'a K;
+
+    type IntoIter = impl Iterator<Item = &'a K> + 'a;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.data.iter()
+    }
+}
+
 impl<K> VecSet<K> {
     pub fn new_one_elem_set(elem: K) -> Self {
         Self { data: vec![elem] }
@@ -20,10 +30,7 @@ impl<K> Default for VecSet<K> {
     }
 }
 
-impl<K> Deref for VecSet<K>
-where
-    K: PartialEq + Eq + Copy,
-{
+impl<K> Deref for VecSet<K> {
     type Target = [K];
 
     fn deref(&self) -> &Self::Target {

diff --git a/crates/linkage/husky-linkage/expect-files/examples/algorithms/quick-sort.md b/crates/linkage/husky-linkage/expect-files/examples/algorithms/quick-sort.md
@@ -1,36 +1,23 @@
-[
-    Linkage {
-        data: LinkageData::PathLeading {
-            path: Fugitive(
-                FugitivePath(
-                    ItemPathId(
-                        Id {
-                            value: 240,
-                        },
+LinkagePantheon {
+    package_path: PackagePath {
+        toolchain: Toolchain {
+            data: ToolchainData::Local {
+                library_path: VirtualPath {
+                    _data: RelPathBuf(
+                        "../../../library",
                     ),
-                ),
-            ),
-            instantiation: LinkageInstantiation {
-                symbol_resolutions: [],
-                separator: None,
+                },
             },
         },
-    },
-    Linkage {
-        data: LinkageData::PathLeading {
-            path: Fugitive(
-                FugitivePath(
-                    ItemPathId(
-                        Id {
-                            value: 241,
-                        },
-                    ),
+        name: `quick-sort`,
+        data: PackagePathSource::Local {
+            path: VirtualPath {
+                _data: RelPathBuf(
+                    "../../../examples/algorithms/quick-sort",
                 ),
-            ),
-            instantiation: LinkageInstantiation {
-                symbol_resolutions: [],
-                separator: None,
             },
         },
     },
-]
+    instantiation_map: {},
+    new_linkages: [],
+}
diff --git a/...-linkage/expect-files/examples/algorithms/quick-sort/item_valkyrie_rides/lib.md b/...-linkage/expect-files/examples/algorithms/quick-sort/item_valkyrie_rides/lib.md
@@ -29,7 +29,7 @@
             rides: VecSet {
                 data: [
                     ValkyrieRide {
-                        linkage_path: TypeItem(
+                        linkage_item_path: TypeItem(
                             TypeItemPath(
                                 ItemPathId(
                                     Id {
@@ -38,7 +38,7 @@
                                 ),
                             ),
                         ),
-                        instantiation: HirInstantiation {
+                        hir_instantiation: HirInstantiation {
                             symbol_map: [
                                 (
                                     Type(
@@ -132,7 +132,7 @@
             rides: VecSet {
                 data: [
                     ValkyrieRide {
-                        linkage_path: TypeItem(
+                        linkage_item_path: TypeItem(
                             TypeItemPath(
                                 ItemPathId(
                                     Id {
@@ -141,7 +141,7 @@
                                 ),
                             ),
                         ),
-                        instantiation: HirInstantiation {
+                        hir_instantiation: HirInstantiation {
                             symbol_map: [
                                 (
                                     Type(