language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-26 21:39:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #3462 from rtfeldman/fix-nested-imports

Browse source 
Fix importing interfaces with nested paths
This commit is contained in:
Folkert de Vries 2022-07-10 18:08:38 +02:00 • committed by GitHub
commit 3b60acb938
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 109 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/compiler/test_gen/src/helpers/dev.rs
View file

@ -1,11 +1,13 @@
use libloading::Library;
use roc_build::link::{link, LinkType};
use roc_builtins::bitcode;
use roc_collections::all::MutMap;
use roc_load::Threading;
use roc_region::all::LineInfo;
use tempfile::tempdir;
#[cfg(any(feature = "gen-llvm", feature = "gen-wasm"))]
use roc_collections::all::MutMap;
#[allow(unused_imports)]
use roc_mono::ir::pretty_print_ir_symbols;
@ -30,11 +32,11 @@ pub fn helper(
_leak: bool,
lazy_literals: bool,
) -> (String, Vec<roc_problem::can::Problem>, Library) {
use std::path::{Path, PathBuf};
use std::path::PathBuf;
let dir = tempdir().unwrap();
let filename = PathBuf::from("Test.roc");
let src_dir = Path::new("fake/test/path");
let src_dir = PathBuf::from("fake/test/path");
let app_o_file = dir.path().join("app.o");
let module_src;

4
crates/compiler/test_gen/src/helpers/llvm.rs
View file

@ -39,12 +39,12 @@ fn create_llvm_module<'a>(
context: &'a inkwell::context::Context,
target: &Triple,
) -> (&'static str, String, &'a Module<'a>) {
use std::path::{Path, PathBuf};
use std::path::PathBuf;
let target_info = roc_target::TargetInfo::from(target);
let filename = PathBuf::from("Test.roc");
let src_dir = Path::new("fake/test/path");
let src_dir = PathBuf::from("fake/test/path");
let module_src;
let temp;

2
crates/compiler/test_gen/src/helpers/wasm.rs
View file

@ -73,7 +73,7 @@ fn compile_roc_to_wasm_bytes<'a, T: Wasm32Result>(
_test_wrapper_type_info: PhantomData<T>,
) -> Vec<u8> {
let filename = PathBuf::from("Test.roc");
let src_dir = Path::new("fake/test/path");
let src_dir = PathBuf::from("fake/test/path");
let module_src;
let temp;