roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-09-21 15:59:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Byte deletion party

Browse Source
This commit is contained in:
Ayaz Hafiz 2022-11-09 09:18:42 -06:00
parent 54f4a70a0b
commit f1180a1549
No known key found for this signature in database
GPG Key ID: 0E2A37416A25EF58
6 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/compiler/can/src/constraint.rs
View File

@ -8,7 +8,7 @@ use roc_module::ident::TagName;
use roc_module::symbol::{ModuleId, Symbol};
use roc_region::all::{Loc, Region};
use roc_types::subs::{ExhaustiveMark, IllegalCycleMark, Variable};
use roc_types::types::{Category, PatternCategory, Type, TypeTag, Types};
use roc_types::types::{Category, PatternCategory, TypeTag, Types};
pub struct Constraints {
pub constraints: Vec<Constraint>,

2
crates/compiler/constrain/src/builtins.rs
View File

@ -1,3 +1,5 @@
#![allow(clippy::too_many_arguments)]
use arrayvec::ArrayVec;
use roc_can::constraint::{Constraint, Constraints, ExpectedTypeIndex};
use roc_can::expected::Expected::{self, *};

33
crates/compiler/constrain/src/expr.rs
View File

@ -1,8 +1,9 @@
#![allow(clippy::too_many_arguments)]
use std::ops::Range;
use crate::builtins::{
empty_list_type, float_literal, int_literal, list_type, num_literal, single_quote_literal,
str_type,
};
use crate::pattern::{constrain_pattern, PatternState};
use roc_can::annotation::IntroducedVariables;
@ -102,7 +103,6 @@ fn constrain_untyped_args(
(vars, pattern_state, function_type)
}
#[allow(clippy::too_many_arguments)]
fn constrain_untyped_closure(
types: &mut Types,
constraints: &mut Constraints,
@ -166,7 +166,7 @@ fn constrain_untyped_closure(
let function_type = {
let typ = types.from_old_type(&function_type);
constraints.push_type(&types, typ)
constraints.push_type(types, typ)
};
let cons = [
@ -233,7 +233,7 @@ pub fn constrain_expr(
let record_type = {
let typ =
types.from_old_type(&Type::Record(field_types, TypeExtension::Closed));
constraints.push_type(&types, typ)
constraints.push_type(types, typ)
};
let record_con = constraints.equal_types_with_storage(
@ -280,11 +280,11 @@ pub fn constrain_expr(
fields,
TypeExtension::from_type(Type::Variable(*ext_var)),
));
constraints.push_type(&types, typ)
constraints.push_type(types, typ)
};
let record_type = {
let typ = types.from_old_type(&Type::Variable(*record_var));
constraints.push_type(&types, typ)
constraints.push_type(types, typ)
};
// NOTE from elm compiler: fields_type is separate so that Error propagates better
@ -376,7 +376,7 @@ pub fn constrain_expr(
let elem_type_index = {
let typ = types.from_old_type(&list_type(list_elem_type));
constraints.push_type(&types, typ)
constraints.push_type(types, typ)
};
list_constraints.push(constraints.equal_types(
elem_type_index,
@ -1606,7 +1606,7 @@ fn constrain_function_def(
&mut ftv,
);
let signature_index = constraints.push_type(types, signature.clone());
let signature_index = constraints.push_type(types, signature);
let (arg_types, signature_closure_type, ret_type) = match types[signature] {
TypeTag::Function(signature_closure_type, ret_type) => (
@ -2492,7 +2492,7 @@ fn constrain_typed_def(
let signature_index = {
// TODO(types-soa) get rid of clone
let typ = types.clone_with_variable_substitutions(signature.clone(), &Default::default());
let typ = types.clone_with_variable_substitutions(signature, &Default::default());
constraints.push_type(types, typ)
};
@ -2705,7 +2705,7 @@ fn constrain_typed_function_arguments(
let pattern_var_index = constraints.push_variable(*pattern_var);
let ann_index = {
// TODO(types-soa) remove clone
let typ = types.clone_with_variable_substitutions(ann.clone(), &Default::default());
let typ = types.clone_with_variable_substitutions(ann, &Default::default());
constraints.push_type(types, typ)
};
@ -3024,7 +3024,6 @@ pub(crate) fn constrain_def_make_constraint(
)
}
#[allow(clippy::too_many_arguments)]
fn constrain_value_def_make_constraint(
constraints: &mut Constraints,
new_rigid_variables: Vec<Variable>,
@ -3273,7 +3272,6 @@ fn constrain_recursive_declarations(
)
}
#[allow(clippy::too_many_arguments)]
fn constraint_recursive_function(
types: &mut Types,
constraints: &mut Constraints,
@ -3481,7 +3479,6 @@ fn constraint_recursive_function(
}
}
#[allow(clippy::too_many_arguments)]
pub fn rec_defs_help_simple(
types: &mut Types,
constraints: &mut Constraints,
@ -3567,10 +3564,8 @@ pub fn rec_defs_help_simple(
let signature_index = {
// TODO(types-soa) remove clone
let typ = types.clone_with_variable_substitutions(
signature.clone(),
&Default::default(),
);
let typ = types
.clone_with_variable_substitutions(signature, &Default::default());
constraints.push_type(types, typ)
};
@ -3792,8 +3787,8 @@ fn rec_defs_help(
hybrid_and_flex_info.vars.extend(new_infer_variables);
let signature_index = {
let typ = types
.clone_with_variable_substitutions(signature.clone(), &Default::default());
let typ =
types.clone_with_variable_substitutions(signature, &Default::default());
constraints.push_type(
types, // TODO(types-soa) remove clone
typ,

4
crates/compiler/constrain/src/pattern.rs
View File

@ -65,7 +65,7 @@ fn headers_from_annotation_help(
ident: symbol,
specializes: _,
} => {
let annotation_index = { let typ = types.from_old_type(&annotation.value); constraints.push_type(types, typ) };
let annotation_index = { let typ = types.from_old_type(annotation.value); constraints.push_type(types, typ) };
let typ = Loc::at(annotation.region, annotation_index);
headers.insert(*symbol, typ);
true
@ -165,7 +165,7 @@ fn headers_from_annotation_help(
&& type_arguments.len() == pat_type_arguments.len()
&& lambda_set_variables.len() == pat_lambda_set_variables.len() =>
{
let annotation_index = { let typ = types.from_old_type( &annotation.value ); constraints.push_type(types, typ) };
let annotation_index = { let typ = types.from_old_type(annotation.value); constraints.push_type(types, typ) };
let typ = Loc::at(annotation.region, annotation_index);
headers.insert(*opaque, typ);

2
crates/compiler/load_internal/src/file.rs
View File

@ -4282,8 +4282,6 @@ pub fn add_imports(
def_types: &mut Vec<(Symbol, Loc<TypeOrVar>)>,
rigid_vars: &mut Vec<Variable>,
) -> (Vec<Variable>, AbilitiesStore) {
use roc_types::types::Type;
let mut import_variables = Vec::new();
let mut cached_symbol_vars = VecMap::default();

2
crates/reporting/tests/helpers/mod.rs
View File

@ -18,7 +18,7 @@ use roc_region::all::Loc;
use roc_solve::solve::{self, Aliases};
use roc_solve_problem::TypeError;
use roc_types::subs::{Content, Subs, VarStore, Variable};
use roc_types::types::{Type, Types};
use roc_types::types::Types;
use std::hash::Hash;
use std::path::{Path, PathBuf};