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

Fix issues from rebase on origin/trunk

Browse source
This commit is contained in:
Richard Feldman 2020-01-18 02:58:55 -05:00
parent 551d5bc92b
commit 5e130d4726
3 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/can/annotation.rs
View file

@ -170,7 +170,7 @@ fn can_tag<'a>(
tag_types.push((symbol, arg_types));
}
Tag::Private { name, args } => {
let symbol = Symbol::from_private_tag(&env.home, name.value);
let symbol = Symbol::from_private_tag(env.home.as_str(), name.value);
let arg_types = args
.iter()

2
src/unify.rs
View file

@ -1,6 +1,6 @@
use crate::can::ident::{Lowercase, ModuleName, Uppercase};
use crate::can::symbol::Symbol;
use crate::collections::{relative_complement, union, MutMap};
use crate::collections::{relative_complement, union, ImMap, MutMap};
use crate::subs::Content::{self, *};
use crate::subs::{Descriptor, FlatType, Mark, OptVariable, Subs, Variable};
use crate::types::RecordFieldLabel;

12
tests/test_uniqueness_infer.rs
View file

@ -986,18 +986,6 @@ mod test_infer_uniq {
);
}
#[test]
fn record_field_access() {
infer_eq(
indoc!(
r#"
\rec -> rec.left
"#
),
"Attr.Attr * (Attr.Attr a { left : (Attr.Attr a b) }* -> Attr.Attr a b)",
);
}
#[test]
fn record_field_accessor_function() {
infer_eq(