Fix clippy warnings and tests

Author: yannham

core/src/bytecode/ast/compat.rs

@@ -1383,12 +1383,7 @@ impl<'ast> FromAst<Node<'ast>> for term::Term {
             }
             Node::Record(record) => {
                 let (data, dyn_fields) = (*record).to_mainline();
-                Term::RecRecord(
-                    data,
-                    record.includes.iter().cloned().collect(),
-                    dyn_fields,
-                    None,
-                )
+                Term::RecRecord(data, record.includes.to_vec(), dyn_fields, None)
             }
             Node::IfThenElse {
                 cond,

core/src/transform/free_vars.rs

@@ -137,8 +137,8 @@ impl CollectFreeVars for RichTerm {
                 let mut rec_fields: HashSet<Ident> =
                     record.fields.keys().map(|id| id.ident()).collect();
                 // `{include foo, [..]}` is defined to have the semantics of `let foo_ = foo in
-                // {foo = foo_, [..]}`. Hence an include count both as a normal field definition and as a free variable of the record (for the
-                // external `foo` to be plugged in).
+                // {foo = foo_, [..]}`. Hence an include count both as a normal field definition
+                // and as a free variable of the record (for the external `foo` to be plugged in).
                 let includes_as_ident = includes.iter().map(|id| id.ident());
                 rec_fields.extend(includes_as_ident.clone());
                 free_vars.extend(includes_as_ident);
@@ -149,8 +149,6 @@ impl CollectFreeVars for RichTerm {
                     dyn_fields: Vec::with_capacity(dyn_fields.len()),
                 };
 
-                free_vars.extend(&rec_fields);
-
                 for (id, t) in record.fields.iter_mut() {
                     fresh.clear();
 

core/tests/integration/main.rs

@@ -313,7 +313,7 @@ impl PartialEq<Error> for ErrorExpectation {
             ) => field == id.label(),
             (
                 TypecheckUnboundIdentifier { identifier },
-                Error::TypecheckError(TypecheckError::UnboundIdentifier { id, .. }),
+                Error::TypecheckError(TypecheckError::UnboundIdentifier(id)),
             ) => id.label() == identifier,
             (
                 TypecheckUnboundTypeVariable { identifier },

lsp/nls/src/position.rs

@@ -218,8 +218,8 @@ impl<'ast> PositionLookup<'ast> {
                             })
                     }));
 
-                    // We include the identifier happening as part of `include` statements.
-                    ident_ranges.extend(data.includes.iter().filter_map(|id| {
+                    // We include the identifier happening as part of `include` expressions.
+                    ident_ranges.extend(data.includes.iter().copied().filter_map(|id| {
                         Some(Entry {
                             range: id.pos.into_opt()?.to_range(),
                             data: IdentData {