language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'ci_ssl_fix' into cli-run-non-app

Browse source
This commit is contained in:
Folkert 2021-02-21 00:14:45 +01:00
commit cbdf4c71ed
7 changed files with 43 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Earthfile
View file

@ -1,4 +1,4 @@
FROM rust:1.49-slim-buster FROM rust:1.50-slim-buster
WORKDIR /earthbuild WORKDIR /earthbuild
prep-debian: prep-debian:
@ -40,7 +40,7 @@ install-zig-llvm-valgrind-clippy-rustfmt:
# rustfmt # rustfmt
RUN rustup component add rustfmt RUN rustup component add rustfmt
# sccache # sccache
RUN apt install libssl-dev RUN apt -y install libssl-dev
RUN cargo install sccache RUN cargo install sccache
RUN sccache -V RUN sccache -V
@ -94,4 +94,4 @@ test-all:
BUILD +save-cache BUILD +save-cache
BUILD +test-zig BUILD +test-zig
BUILD +test-rust BUILD +test-rust

1
compiler/gen_dev/src/generic64/x86_64.rs
View file

@ -705,6 +705,7 @@ fn x86_64_generic_setup_stack<'a>(
} }
#[inline(always)] #[inline(always)]
#[allow(clippy::unnecessary_wraps)]
fn x86_64_generic_cleanup_stack<'a>( fn x86_64_generic_cleanup_stack<'a>(
buf: &mut Vec<'a, u8>, buf: &mut Vec<'a, u8>,
saved_regs: &[X86_64GeneralReg], saved_regs: &[X86_64GeneralReg],

1
compiler/load/src/file.rs
View file

@ -3496,6 +3496,7 @@ fn unpack_exposes_entries<'a>(
} }
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
#[allow(clippy::unnecessary_wraps)]
fn canonicalize_and_constrain<'a, F>( fn canonicalize_and_constrain<'a, F>(
arena: &'a Bump, arena: &'a Bump,
module_ids: &ModuleIds, module_ids: &ModuleIds,

6
compiler/mono/src/decision_tree.rs
View file

@ -229,7 +229,11 @@ fn flatten<'a>(
tag_name, tag_name,
layout, layout,
} if union.alternatives.len() == 1 } if union.alternatives.len() == 1
&& !matches!(layout, Layout::Union(UnionLayout::NullableWrapped { .. })| Layout::Union(UnionLayout::NullableUnwrapped { .. })) => && !matches!(
layout,
Layout::Union(UnionLayout::NullableWrapped { .. })
| Layout::Union(UnionLayout::NullableUnwrapped { .. })
) =>
{ {
// TODO ^ do we need to check that guard.is_none() here? // TODO ^ do we need to check that guard.is_none() here?

5
compiler/mono/src/layout.rs
View file

@ -643,7 +643,10 @@ impl<'a> Layout<'a> {
Union(variant) => { Union(variant) => {
use UnionLayout::*; use UnionLayout::*;
matches!(variant, Recursive(_)| NullableWrapped { .. } | NullableUnwrapped { .. }) matches!(
variant,
Recursive(_) | NullableWrapped { .. } | NullableUnwrapped { .. }
)
} }
RecursivePointer => true, RecursivePointer => true,

24
compiler/reporting/src/error/type.rs
View file

@ -1628,10 +1628,18 @@ fn to_diff<'b>(
ErrorType::Alias(Symbol::NUM_INT, _, _) => true, ErrorType::Alias(Symbol::NUM_INT, _, _) => true,
ErrorType::Type(Symbol::NUM_NUM, args) => { ErrorType::Type(Symbol::NUM_NUM, args) => {
matches!( &args.get(0) ,Some(ErrorType::Type(Symbol::NUM_INTEGER, _)) | Some(ErrorType::Alias(Symbol::NUM_INTEGER, _, _))) matches!(
&args.get(0),
Some(ErrorType::Type(Symbol::NUM_INTEGER, _))
| Some(ErrorType::Alias(Symbol::NUM_INTEGER, _, _))
)
} }
ErrorType::Alias(Symbol::NUM_NUM, args, _) => { ErrorType::Alias(Symbol::NUM_NUM, args, _) => {
matches!(&args.get(0), Some((_, ErrorType::Type(Symbol::NUM_INTEGER, _))) | Some((_, ErrorType::Alias(Symbol::NUM_INTEGER, _, _)))) matches!(
&args.get(0),
Some((_, ErrorType::Type(Symbol::NUM_INTEGER, _)))
| Some((_, ErrorType::Alias(Symbol::NUM_INTEGER, _, _)))
)
} }
_ => false, _ => false,
}; };
@ -1640,11 +1648,19 @@ fn to_diff<'b>(
ErrorType::Alias(Symbol::NUM_FLOAT, _, _) => true, ErrorType::Alias(Symbol::NUM_FLOAT, _, _) => true,
ErrorType::Type(Symbol::NUM_NUM, args) => { ErrorType::Type(Symbol::NUM_NUM, args) => {
matches!(&args.get(0), Some(ErrorType::Type(Symbol::NUM_FLOATINGPOINT, _)) | Some(ErrorType::Alias(Symbol::NUM_FLOATINGPOINT, _, _))) matches!(
&args.get(0),
Some(ErrorType::Type(Symbol::NUM_FLOATINGPOINT, _))
| Some(ErrorType::Alias(Symbol::NUM_FLOATINGPOINT, _, _))
)
} }
ErrorType::Alias(Symbol::NUM_NUM, args, _) => { ErrorType::Alias(Symbol::NUM_NUM, args, _) => {
matches!(&args.get(0), Some((_, ErrorType::Type(Symbol::NUM_FLOATINGPOINT, _))) | Some((_, ErrorType::Alias(Symbol::NUM_FLOATINGPOINT, _, _)))) matches!(
&args.get(0),
Some((_, ErrorType::Type(Symbol::NUM_FLOATINGPOINT, _)))
| Some((_, ErrorType::Alias(Symbol::NUM_FLOATINGPOINT, _, _)))
)
} }
_ => false, _ => false,
}; };

19
compiler/types/src/types.rs
View file

@ -648,17 +648,16 @@ impl Type {
// attribute on the recursion variable must match the uniqueness of the whole tag // attribute on the recursion variable must match the uniqueness of the whole tag
// union. We enforce that here. // union. We enforce that here.
if let Some(rec_uvar) = find_rec_var_uniqueness(base_type, aliases) { if let Some(Bool::Container(unbound_cvar, mvars1)) =
if let Bool::Container(unbound_cvar, mvars1) = rec_uvar { find_rec_var_uniqueness(base_type, aliases)
if let Type::Boolean(Bool::Container(bound_cvar, mvars2)) = uniqueness_type {
{ if let Type::Boolean(Bool::Container(bound_cvar, mvars2)) = uniqueness_type {
debug_assert!(mvars1.is_empty()); debug_assert!(mvars1.is_empty());
debug_assert!(mvars2.is_empty()); debug_assert!(mvars2.is_empty());
let mut substitution = ImMap::default(); let mut substitution = ImMap::default();
substitution.insert(unbound_cvar, Type::Variable(*bound_cvar)); substitution.insert(unbound_cvar, Type::Variable(*bound_cvar));
base_type.substitute(&substitution); base_type.substitute(&substitution);
}
} }
} }
} }