language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #2266 from rtfeldman/joshuawarner32/loc

Browse source 
Parser refactor: always group (Row, Col) into Position
This commit is contained in:
Folkert de Vries 2021-12-24 00:02:13 +01:00 • committed by GitHub
commit 5f7476d54f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
72 changed files with 2011 additions and 2268 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/solve/src/solve.rs
View file

@ -3,7 +3,7 @@ use roc_can::expected::{Expected, PExpected};
use roc_collections::all::MutMap;
use roc_module::ident::TagName;
use roc_module::symbol::Symbol;
use roc_region::all::{Located, Region};
use roc_region::all::{Loc, Region};
use roc_types::solved_types::Solved;
use roc_types::subs::{
AliasVariables, Content, Descriptor, FlatType, Mark, OptVariable, Rank, RecordFields, Subs,
@ -426,7 +426,7 @@ fn solve(
local_def_vars.push((
*symbol,
Located {
Loc {
value: var,
region: loc_type.region,
},
@ -506,7 +506,7 @@ fn solve(
local_def_vars.push((
*symbol,
Located {
Loc {
value: var,
region: loc_type.region,
},
@ -1222,7 +1222,7 @@ fn check_for_infinite_type(
subs: &mut Subs,
problems: &mut Vec<TypeError>,
symbol: Symbol,
loc_var: Located<Variable>,
loc_var: Loc<Variable>,
) {
let var = loc_var.value;
@ -1244,7 +1244,7 @@ fn circular_error(
subs: &mut Subs,
problems: &mut Vec<TypeError>,
symbol: Symbol,
loc_var: &Located<Variable>,
loc_var: &Loc<Variable>,
) {
let var = loc_var.value;
let (error_type, _) = subs.var_to_error_type(var);