Merge pull request #107 from xiyuzhai/main

update expect
xiyuzhai-husky-lang · Jun 29, 2024 · 5f4249a · 5f4249a
2 parents 06218fa + 8562262
commit 5f4249a
Show file tree

Hide file tree

Showing 16 changed files with 47 additions and 47 deletions.
diff --git a/...s/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/eight.md b/...s/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/eight.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/five.md b/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/five.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/four.md b/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/four.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -54,7 +54,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -74,7 +74,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/nine.md b/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/nine.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -54,7 +54,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...les/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/one.md b/...les/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/one.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...s/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/seven.md b/...s/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/seven.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -54,7 +54,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...les/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/six.md b/...les/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/six.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -54,7 +54,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...s/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/three.md b/...s/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/three.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...les/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/two.md b/...les/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/two.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/zero.md b/...es/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/digits/zero.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...ect-files/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/main.md b/...ect-files/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/main.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...ct-files/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/major.md b/...ct-files/examples/mnist-classifier/module_lsp_code_lens_unresolved/src/major.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -34,7 +34,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -54,7 +54,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -74,7 +74,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -94,7 +94,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -114,7 +114,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),
@@ -134,7 +134,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...ns/expect-files/registry/mnist-0.1.0/module_lsp_code_lens_unresolved/src/lib.md b/...ns/expect-files/registry/mnist-0.1.0/module_lsp_code_lens_unresolved/src/lib.md
@@ -14,7 +14,7 @@
         command: Some(
             Command {
                 title: "#deps",
-                command: "deps",
+                command: "husky-analyzer.deps",
                 arguments: None,
             },
         ),

diff --git a/...iagnostics/expect-files/examples/mnist-classifier/diagnostic_sheet/src/fermi.md b/...iagnostics/expect-files/examples/mnist-classifier/diagnostic_sheet/src/fermi.md
@@ -16,13 +16,7 @@ DiagnosticSheet {
         diagnostics: [],
     },
     expr_ty_diagnostic_sheet: ExprTypeDiagnosticSheet {
-        diagnostics: [
-            Diagnostic {
-                message: "place error cannot convert to const",
-                severity: Error,
-                range: [29:19, 29:49),
-            },
-        ],
+        diagnostics: [],
     },
 }
 ```
diff --git a/crates/kernel/husky-fly-term/src/term/quary.rs b/crates/kernel/husky-fly-term/src/term/quary.rs
@@ -100,8 +100,10 @@ pub type FlyPlaceResult<T> = Result<T, FlyPlaceError>;
 impl FlyQuary {
     pub(crate) fn bind(&self, contract: Contract) -> FlyPlaceResult<()> {
         match (contract, self) {
-            (Contract::Compterm, FlyQuary::Compterm) => Ok(()),
-            (Contract::Compterm, _) => Err(FlyPlaceError::CannotConvertToConst),
+            // (Contract::Compterm, FlyQuary::Compterm) => Ok(()),
+            // (Contract::Compterm, _) => Err(FlyPlaceError::CannotConvertToConst),
+            // ad hoc
+            (Contract::Compterm, _) => Ok(()),
             (Contract::Leash, FlyQuary::Leashed { .. }) => Ok(()),
             (Contract::Leash, _) => todo!("error"),
             (Contract::Pure, _) => Ok(()),

diff --git a/...-expr/expect-files/examples/mnist-classifier/decl_sem_expr_regions/src/fermi.md b/...-expr/expect-files/examples/mnist-classifier/decl_sem_expr_regions/src/fermi.md
@@ -1851,11 +1851,15 @@
                                         ),
                                     },
                                     resolve_progress: ExpectationProgress::Resolved(
-                                        Err(
-                                            FlyTermExpectationError::Original(
-                                                OriginalFlyTermExpectationError::Place(
-                                                    CannotConvertToConst,
-                                                ),
+                                        Ok(
+                                            ExpectationOutcome::Coercion(
+                                                ExpectCoercionOutcome {
+                                                    coercion: Trivial(
+                                                        TrivialFlyCoercion {
+                                                            expectee_quary: Transient,
+                                                        },
+                                                    ),
+                                                },
                                             ),
                                         ),
                                     ),