This commit is contained in:
Richard Feldman 2024-10-13 11:11:12 -04:00
parent e589923ae8
commit 62b4fe6943
No known key found for this signature in database
GPG key ID: DAC334802F365236
4 changed files with 13 additions and 13 deletions

View file

@ -2969,7 +2969,7 @@ fn constrain_typed_function_arguments(
None
};
let it = arguments.iter().zip(arg_types.into_iter()).enumerate();
let it = arguments.iter().zip(arg_types).enumerate();
for (index, ((pattern_var, annotated_mark, loc_pattern), ann)) in it {
let pattern_var_index = constraints.push_variable(*pattern_var);
let ann_index = constraints.push_type(types, ann);
@ -3123,7 +3123,7 @@ fn constrain_typed_function_arguments_simple(
arguments: &[(Variable, AnnotatedMark, Loc<Pattern>)],
arg_types: Slice<TypeTag>,
) {
let it = arguments.iter().zip(arg_types.into_iter()).enumerate();
let it = arguments.iter().zip(arg_types).enumerate();
for (index, ((pattern_var, annotated_mark, loc_pattern), ann)) in it {
let pattern_var_index = constraints.push_variable(*pattern_var);
let ann_index = constraints.push_type(types, ann);

View file

@ -171,7 +171,7 @@ fn headers_from_annotation_help(
return false;
}
arguments.iter().zip(arg_types_slice.into_iter()).all(
arguments.iter().zip(arg_types_slice).all(
|(arg_pattern, arg_type)| {
headers_from_annotation_help(
types,

View file

@ -1020,7 +1020,7 @@ fn register_tag_arguments(
VariableSubsSlice::default()
} else {
let new_variables = env.subs.reserve_into_vars(arguments.len());
let it = new_variables.indices().zip(arguments.into_iter());
let it = new_variables.indices().zip(arguments);
for (target_index, argument) in it {
let var = RegisterVariable::with_stack(env, rank, arena, types, argument, stack);
@ -1071,7 +1071,7 @@ fn insert_tags_fast_path(
let new_variable_slices = env.subs.reserve_variable_slices(tags.len());
match find_tag_name_run(&types[tags], env.subs) {
Some(new_tag_names) => {
let it = (new_variable_slices.indices()).zip(payload_slices.into_iter());
let it = (new_variable_slices.indices()).zip(payload_slices);
for (variable_slice_index, arguments_index) in it {
let arguments = types[arguments_index];
@ -1086,8 +1086,8 @@ fn insert_tags_fast_path(
let it = (new_variable_slices.indices())
.zip(new_tag_names.indices())
.zip(tags.into_iter())
.zip(payload_slices.into_iter());
.zip(tags)
.zip(payload_slices);
for (((variable_slice_index, tag_name_index), tag_name), arguments_index) in it {
let arguments = types[arguments_index];

View file

@ -845,7 +845,7 @@ impl Types {
let record_fields = RecordFields {
length: fields.len() as u16,
field_names_start: field_names.start() as u32,
variables_start: field_type_slice.start() as u32,
variables_start: field_type_slice.start(),
field_types_start: field_types.start() as u32,
};
@ -874,7 +874,7 @@ impl Types {
let tuple_elems = TupleElems {
length: elems.len() as u16,
variables_start: elem_type_slice.start() as u32,
variables_start: elem_type_slice.start(),
elem_index_start: elem_index_slice.start() as u32,
};
@ -1419,8 +1419,8 @@ mod debug_types {
let (names, kind, tys) = types.record_fields_slices(fields);
let fmt_fields = names
.into_iter()
.zip(kind.into_iter())
.zip(tys.into_iter())
.zip(kind)
.zip(tys)
.map(|((name, kind), ty)| {
let (name, kind) = (&types[name], types[kind]);
let fmt_kind = f.text(match kind {
@ -1484,7 +1484,7 @@ mod debug_types {
let (tags, payload_slices) = types.union_tag_slices(tags);
let fmt_tags =
tags.into_iter()
.zip(payload_slices.into_iter())
.zip(payload_slices)
.map(|(tag, payload_slice_index)| {
let payload_slice = types[payload_slice_index];
let fmt_payloads = payload_slice
@ -1523,7 +1523,7 @@ mod debug_types {
let args = types.get_type_arguments(tag);
let fmt_args = args
.into_iter()
.zip(type_argument_abilities.into_iter())
.zip(type_argument_abilities)
.map(|(arg, abilities)| {
let abilities = &types[abilities];
let arg = typ(types, f, Arg, arg);