roc-lang/roc
1
1
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2024-10-04 22:27:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

Clean up more unused Nat stuff

Browse Source
This commit is contained in:
Richard Feldman 2024-01-24 23:32:10 -05:00
parent 76dcbee25f
commit 204cee7d60
No known key found for this signature in database
GPG Key ID: F1F21AA5B1D9E43B
5 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/compiler/mono/src/ir.rs
View File

@ -6845,7 +6845,6 @@ fn register_capturing_closure<'a>(
args,
closure_var,
ret,
env.target_info,
)
};

1
crates/compiler/mono/src/layout.rs
View File

@ -1817,7 +1817,6 @@ impl<'a> LambdaSet<'a> {
args: VariableSubsSlice,
closure_var: Variable,
ret_var: Variable,
target_info: TargetInfo,
) -> Result<Self, LayoutProblem> {
let mut env = Env::from_components(cache, subs, arena);
Self::from_var(&mut env, args, closure_var, ret_var).value()

27
crates/compiler/solve/src/ability.rs
View File

@ -10,8 +10,7 @@ use roc_error_macros::internal_error;
use roc_module::symbol::{ModuleId, Symbol};
use roc_region::all::{Loc, Region};
use roc_solve_problem::{
NotDerivableContext, NotDerivableDecode, NotDerivableEncode, NotDerivableEq, TypeError,
UnderivableReason, Unfulfilled,
NotDerivableContext, NotDerivableEq, TypeError, UnderivableReason, Unfulfilled,
};
use roc_solve_schema::UnificationMode;
use roc_types::num::NumericRange;
@ -508,7 +507,6 @@ fn is_builtin_dec_alias(symbol: Symbol) -> bool {
#[inline(always)]
fn is_builtin_number_alias(symbol: Symbol) -> bool {
is_builtin_fixed_int_alias(symbol)
|| is_builtin_nat_alias(symbol)
|| is_builtin_float_alias(symbol)
|| is_builtin_dec_alias(symbol)
}
@ -947,8 +945,7 @@ impl DerivableVisitor for DeriveEncoding {
#[inline(always)]
fn is_derivable_builtin_opaque(symbol: Symbol) -> bool {
(is_builtin_number_alias(symbol) && !is_builtin_nat_alias(symbol))
|| is_builtin_bool_alias(symbol)
is_builtin_number_alias(symbol) || is_builtin_bool_alias(symbol)
}
#[inline(always)]
@ -1015,7 +1012,7 @@ impl DerivableVisitor for DeriveEncoding {
}
#[inline(always)]
fn visit_alias(var: Variable, symbol: Symbol) -> Result<Descend, NotDerivable> {
fn visit_alias(_var: Variable, symbol: Symbol) -> Result<Descend, NotDerivable> {
Ok(Descend(!is_builtin_number_alias(symbol)))
}
@ -1041,8 +1038,7 @@ impl DerivableVisitor for DeriveDecoding {
#[inline(always)]
fn is_derivable_builtin_opaque(symbol: Symbol) -> bool {
(is_builtin_number_alias(symbol) && !is_builtin_nat_alias(symbol))
|| is_builtin_bool_alias(symbol)
is_builtin_number_alias(symbol) || is_builtin_bool_alias(symbol)
}
#[inline(always)]
@ -1075,9 +1071,9 @@ impl DerivableVisitor for DeriveDecoding {
if subs[field].is_optional() {
return Err(NotDerivable {
var,
context: NotDerivableContext::Decode(NotDerivableDecode::OptionalRecordField(
context: NotDerivableContext::DecodeOptionalRecordField(
subs[field_name].clone(),
)),
),
});
}
}
@ -1120,7 +1116,7 @@ impl DerivableVisitor for DeriveDecoding {
}
#[inline(always)]
fn visit_alias(var: Variable, symbol: Symbol) -> Result<Descend, NotDerivable> {
fn visit_alias(_var: Variable, symbol: Symbol) -> Result<Descend, NotDerivable> {
Ok(Descend(!is_builtin_number_alias(symbol)))
}
@ -1179,9 +1175,9 @@ impl DerivableVisitor for DeriveHash {
if subs[field].is_optional() {
return Err(NotDerivable {
var,
context: NotDerivableContext::Decode(NotDerivableDecode::OptionalRecordField(
context: NotDerivableContext::DecodeOptionalRecordField(
subs[field_name].clone(),
)),
),
});
}
}
@ -1255,7 +1251,6 @@ impl DerivableVisitor for DeriveEq {
#[inline(always)]
fn is_derivable_builtin_opaque(symbol: Symbol) -> bool {
is_builtin_fixed_int_alias(symbol)
|| is_builtin_nat_alias(symbol)
|| is_builtin_dec_alias(symbol)
|| is_builtin_bool_alias(symbol)
}
@ -1294,9 +1289,9 @@ impl DerivableVisitor for DeriveEq {
if subs[field].is_optional() {
return Err(NotDerivable {
var,
context: NotDerivableContext::Decode(NotDerivableDecode::OptionalRecordField(
context: NotDerivableContext::DecodeOptionalRecordField(
subs[field_name].clone(),
)),
),
});
}
}

19
crates/compiler/types/src/subs.rs
View File

@ -1277,8 +1277,6 @@ define_const_var! {
:pub UNSIGNED64,
:pub UNSIGNED128,
:pub NATURAL,
// Integer Signed8 := Signed8
INTEGER_SIGNED8,
INTEGER_SIGNED16,
@ -1292,8 +1290,6 @@ define_const_var! {
INTEGER_UNSIGNED64,
INTEGER_UNSIGNED128,
INTEGER_NATURAL,
// Num (Integer Signed8) := Integer Signed8
NUM_INTEGER_SIGNED8,
NUM_INTEGER_SIGNED16,
@ -1307,8 +1303,6 @@ define_const_var! {
NUM_INTEGER_UNSIGNED64,
NUM_INTEGER_UNSIGNED128,
NUM_INTEGER_NATURAL,
// I8 : Num (Integer Signed8)
:pub I8,
:pub I16,
@ -1322,8 +1316,6 @@ define_const_var! {
:pub U64,
:pub U128,
:pub NAT,
// Binary32 : []
BINARY32,
BINARY64,
@ -1382,8 +1374,6 @@ impl Variable {
Symbol::NUM_U16 => Some(Variable::U16),
Symbol::NUM_U8 => Some(Variable::U8),
Symbol::NUM_NAT => Some(Variable::NAT),
Symbol::BOOL_BOOL => Some(Variable::BOOL),
Symbol::NUM_F64 => Some(Variable::F64),
@ -1589,15 +1579,6 @@ fn define_integer_types(subs: &mut Subs) {
Variable::NUM_INTEGER_UNSIGNED8,
Variable::U8,
);
integer_type(
subs,
Symbol::NUM_NAT,
Variable::NATURAL,
Variable::INTEGER_NATURAL,
Variable::NUM_INTEGER_NATURAL,
Variable::NAT,
);
}
#[allow(clippy::too_many_arguments)]

3
crates/reporting/src/error/type.rs
View File

@ -15,8 +15,7 @@ use roc_module::symbol::Symbol;
use roc_problem::Severity;
use roc_region::all::{LineInfo, Region};
use roc_solve_problem::{
NotDerivableContext, NotDerivableDecode, NotDerivableEncode, NotDerivableEq, TypeError,
UnderivableReason, Unfulfilled,
NotDerivableContext, NotDerivableEq, TypeError, UnderivableReason, Unfulfilled,
};
use roc_std::RocDec;
use roc_types::pretty_print::{Parens, WILDCARD};