Fix missing position panic, remove unused function

core/src/parser/uniterm.rs

@@ -96,7 +96,8 @@ where
 // For nodes such as `Type` or `Record`, the following implementation has to choose between two
 // positions to use: the one of the wrapping `UniTerm`, and the one stored inside the `RichTerm` or
 // the `Type`. This implementation assumes that the latest set is the one of `UniTerm`, which is
-// the single source of truth.
+// the single source of truth. In fact, it happens that only the outermost uniterm position is set
+// while the innermost is still `TermPos::None`.
 impl<'ast> TryConvert<'ast, UniTerm<'ast>> for Type<'ast> {
     type Error = ParseError;
 
@@ -123,7 +124,10 @@ impl<'ast> TryConvert<'ast, UniTerm<'ast>> for Type<'ast> {
                     return Err(ParseError::InvalidContract(ut.pos.unwrap()));
                 }
 
-                TypeF::Contract(alloc.ast(ast))
+                TypeF::Contract(alloc.ast(Ast {
+                    node: ast.node,
+                    pos,
+                }))
             }
         };
 

core/src/parser/utils.rs

@@ -233,8 +233,10 @@ impl EtaExpand for ExtendedInfixOp {
                             primop::PrimOp::Eq,
                             builder::var(fst_arg),
                             builder::var(snd_arg),
-                        ),
-                    ),
+                        )
+                        .with_pos(pos),
+                    )
+                    .with_pos(pos),
                 )
                 .node
             }
@@ -360,15 +362,6 @@ pub fn mk_label(typ: Type, src_id: FileId, l: usize, r: usize) -> Label {
     }
 }
 
-/// Same as `mk_span`, but for merge labels. The kind is set to the default one
-/// (`MergeKind::Standard`).
-pub fn mk_merge_label(src_id: FileId, l: usize, r: usize) -> MergeLabel {
-    MergeLabel {
-        span: mk_span(src_id, l, r),
-        kind: Default::default(),
-    }
-}
-
 /// Checks that there are no duplicate bindings in a let block (when bindins are simple, that is
 /// they aren't pattern), and builds the corresponding let block node if the check passes.
 pub fn mk_let<'ast>(