language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Implement @smores56's feedback from #7156

Browse source
This commit is contained in:
Richard Feldman 2024-10-13 11:16:50 -04:00
parent 62b4fe6943
commit 08b32927f1
No known key found for this signature in database
GPG key ID: DAC334802F365236
2 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
crates/compiler/types/src/subs.rs
View file

@ -11,7 +11,7 @@ use roc_module::ident::{Lowercase, TagName, Uppercase};
use roc_module::symbol::{ModuleId, Symbol}; use roc_module::symbol::{ModuleId, Symbol};
use soa::{Index, Slice}; use soa::{Index, Slice};
use std::fmt; use std::fmt;
use std::iter::{once, Iterator}; use std::iter::{self, Iterator};
// if your changes cause this number to go down, great! // if your changes cause this number to go down, great!
// please change it to the lower number. // please change it to the lower number.
@ -1625,7 +1625,7 @@ impl Subs {
)) ))
}); });
let u8_slice = subs.insert_into_vars(std::iter::once(Variable::U8)); let u8_slice = subs.insert_into_vars(iter::once(Variable::U8));
subs.set_content( subs.set_content(
Variable::LIST_U8, Variable::LIST_U8,
Content::Structure(FlatType::Apply(Symbol::LIST_LIST, u8_slice)), Content::Structure(FlatType::Apply(Symbol::LIST_LIST, u8_slice)),
@ -1703,7 +1703,7 @@ impl Subs {
Slice::new(start, (end - start) as u16) Slice::new(start, (end - start) as u16)
} }
/// Reserve space for `length` variables in the subs.variables array /// Reserve space for `length` variables in our `variables`
/// ///
/// This is useful when we know how many variables e.g. a loop will produce, /// This is useful when we know how many variables e.g. a loop will produce,
/// but the loop itself also produces new variables. We often want to work /// but the loop itself also produces new variables. We often want to work
@ -2630,13 +2630,13 @@ pub type UnionLambdas = UnionLabels<Symbol>;
impl UnionTags { impl UnionTags {
pub fn for_result(subs: &mut Subs, ok_payload: Variable, err_payload: Variable) -> Self { pub fn for_result(subs: &mut Subs, ok_payload: Variable, err_payload: Variable) -> Self {
let ok_tuple = { let ok_tuple = {
let variables_slice = subs.insert_into_vars(std::iter::once(ok_payload)); let variables_slice = subs.insert_into_vars(iter::once(ok_payload));
("Ok".into(), variables_slice) ("Ok".into(), variables_slice)
}; };
let err_tuple = { let err_tuple = {
let variables_slice = subs.insert_into_vars(std::iter::once(err_payload)); let variables_slice = subs.insert_into_vars(iter::once(err_payload));
("Err".into(), variables_slice) ("Err".into(), variables_slice)
}; };
@ -3444,22 +3444,22 @@ fn occurs(
safe!([Variable], subs.get_subs_slice(*args)).iter(), safe!([Variable], subs.get_subs_slice(*args)).iter(),
), ),
Func(arg_vars, closure_var, ret_var) => { Func(arg_vars, closure_var, ret_var) => {
let it = once(safe!(Variable, ret_var)) let it = iter::once(safe!(Variable, ret_var))
.chain(once(safe!(Variable, closure_var))) .chain(iter::once(safe!(Variable, closure_var)))
.chain(safe!([Variable], subs.get_subs_slice(*arg_vars)).iter()); .chain(safe!([Variable], subs.get_subs_slice(*arg_vars)).iter());
short_circuit(subs, root_var, ctx, it) short_circuit(subs, root_var, ctx, it)
} }
Record(vars_by_field, ext) => { Record(vars_by_field, ext) => {
let slice = let slice =
VariableSubsSlice::new(vars_by_field.variables_start, vars_by_field.length); VariableSubsSlice::new(vars_by_field.variables_start, vars_by_field.length);
let it = once(safe!(Variable, ext)) let it = iter::once(safe!(Variable, ext))
.chain(safe!([Variable], subs.get_subs_slice(slice)).iter()); .chain(safe!([Variable], subs.get_subs_slice(slice)).iter());
short_circuit(subs, root_var, ctx, it) short_circuit(subs, root_var, ctx, it)
} }
Tuple(vars_by_elem, ext) => { Tuple(vars_by_elem, ext) => {
let slice = let slice =
VariableSubsSlice::new(vars_by_elem.variables_start, vars_by_elem.length); VariableSubsSlice::new(vars_by_elem.variables_start, vars_by_elem.length);
let it = once(safe!(Variable, ext)) let it = iter::once(safe!(Variable, ext))
.chain(safe!([Variable], subs.get_subs_slice(slice)).iter()); .chain(safe!([Variable], subs.get_subs_slice(slice)).iter());
short_circuit(subs, root_var, ctx, it) short_circuit(subs, root_var, ctx, it)
} }
@ -3470,7 +3470,7 @@ fn occurs(
short_circuit_help(subs, root_var, ctx, ext_var) short_circuit_help(subs, root_var, ctx, ext_var)
} }
FunctionOrTagUnion(_, _, ext) => { FunctionOrTagUnion(_, _, ext) => {
short_circuit(subs, root_var, ctx, once(&ext.var())) short_circuit(subs, root_var, ctx, iter::once(&ext.var()))
} }
RecursiveTagUnion(_, tags, ext) => { RecursiveTagUnion(_, tags, ext) => {
let ext_var = ext.var(); let ext_var = ext.var();

8
crates/soa/src/soa_slice.rs
View file

@ -61,12 +61,12 @@ impl<T> Slice<T> {
self.start += amount self.start += amount
} }
pub fn get_slice<'a>(&self, slice: &'a [T]) -> &'a [T] { pub fn get_slice<'a>(&self, elems: &'a [T]) -> &'a [T] {
&slice[self.indices()] &elems[self.indices()]
} }
pub fn get_slice_mut<'a>(&self, slice: &'a mut [T]) -> &'a mut [T] { pub fn get_slice_mut<'a>(&self, elems: &'a mut [T]) -> &'a mut [T] {
&mut slice[self.indices()] &mut elems[self.indices()]
} }
#[inline(always)] #[inline(always)]