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

merge upstream/main

Browse source
This commit is contained in:
Luke Boswell 2022-11-06 09:27:46 +11:00
commit cec67721e6
No known key found for this signature in database
GPG key ID: 0E908525B2C7BD68
59 changed files with 2542 additions and 990 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/repl_expect/src/lib.rs
View file

@ -8,10 +8,7 @@ use {
layout::{CapturesNiche, Layout, LayoutCache},
},
roc_parse::ast::Expr,
roc_repl_eval::{
eval::{jit_to_ast, ToAstProblem},
ReplAppMemory,
},
roc_repl_eval::{eval::jit_to_ast, ReplAppMemory},
roc_target::TargetInfo,
roc_types::subs::{Subs, Variable},
std::sync::Arc,
@ -36,7 +33,7 @@ pub fn get_values<'a>(
start: *const u8,
start_offset: usize,
variables: &[Variable],
) -> Result<(usize, Vec<Expr<'a>>), ToAstProblem> {
) -> (usize, Vec<Expr<'a>>) {
let mut result = Vec::with_capacity(variables.len());
let memory = ExpectMemory { start };
@ -75,13 +72,13 @@ pub fn get_values<'a>(
interns,
layout_interner.fork(),
target_info,
)?
)
};
result.push(expr);
}
Ok((app.offset, result))
(app.offset, result)
}
#[cfg(not(windows))]