mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-30 23:31:12 +00:00
remove Mode from stdlib
This commit is contained in:
Folkert
parent
af9f709eef
commit
ff3f231155
6 changed files with 12 additions and 72 deletions
|
|
@ -4,7 +4,7 @@ use crossbeam::channel::{bounded, Sender};
|
|||
use crossbeam::deque::{Injector, Stealer, Worker};
|
||||
use crossbeam::thread;
|
||||
use parking_lot::Mutex;
|
||||
use roc_builtins::std::{Mode, StdLib};
|
||||
use roc_builtins::std::StdLib;
|
||||
use roc_can::constraint::Constraint;
|
||||
use roc_can::def::{Declaration, Def};
|
||||
use roc_can::module::{canonicalize_module_defs, Module};
|
||||
|
|
@ -427,7 +427,6 @@ fn start_phase<'a>(module_id: ModuleId, phase: Phase, state: &mut State<'a>) ->
|
|||
module_ids: Arc::clone(&state.arc_modules),
|
||||
shorthands: Arc::clone(&state.arc_shorthands),
|
||||
ident_ids_by_module: Arc::clone(&state.ident_ids_by_module),
|
||||
mode: state.stdlib.mode,
|
||||
}
|
||||
}
|
||||
Phase::Parse => {
|
||||
|
|
@ -504,7 +503,6 @@ fn start_phase<'a>(module_id: ModuleId, phase: Phase, state: &mut State<'a>) ->
|
|||
dep_idents,
|
||||
exposed_symbols,
|
||||
module_ids,
|
||||
mode: state.stdlib.mode,
|
||||
aliases,
|
||||
}
|
||||
}
|
||||
|
|
@ -946,7 +944,6 @@ enum BuildTask<'a> {
|
|||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
shorthands: Arc<Mutex<MutMap<&'a str, PackageOrPath<'a>>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
mode: Mode,
|
||||
},
|
||||
Parse {
|
||||
header: ModuleHeader<'a>,
|
||||
|
|
@ -955,7 +952,6 @@ enum BuildTask<'a> {
|
|||
parsed: ParsedModule<'a>,
|
||||
module_ids: ModuleIds,
|
||||
dep_idents: MutMap<ModuleId, IdentIds>,
|
||||
mode: Mode,
|
||||
exposed_symbols: MutSet<Symbol>,
|
||||
aliases: MutMap<Symbol, Alias>,
|
||||
},
|
||||
|
|
@ -1052,7 +1048,7 @@ where
|
|||
{
|
||||
use LoadResult::*;
|
||||
|
||||
let load_start = LoadStart::from_path(arena, filename, stdlib.mode)?;
|
||||
let load_start = LoadStart::from_path(arena, filename)?;
|
||||
|
||||
match load(
|
||||
arena,
|
||||
|
|
@ -1083,7 +1079,7 @@ where
|
|||
{
|
||||
use LoadResult::*;
|
||||
|
||||
let load_start = LoadStart::from_path(arena, filename, stdlib.mode)?;
|
||||
let load_start = LoadStart::from_path(arena, filename)?;
|
||||
|
||||
match load(
|
||||
arena,
|
||||
|
|
@ -1116,7 +1112,7 @@ where
|
|||
{
|
||||
use LoadResult::*;
|
||||
|
||||
let load_start = LoadStart::from_str(arena, filename, src, stdlib.mode)?;
|
||||
let load_start = LoadStart::from_str(arena, filename, src)?;
|
||||
|
||||
match load(
|
||||
arena,
|
||||
|
|
@ -1141,11 +1137,7 @@ struct LoadStart<'a> {
|
|||
}
|
||||
|
||||
impl<'a> LoadStart<'a> {
|
||||
pub fn from_path(
|
||||
arena: &'a Bump,
|
||||
filename: PathBuf,
|
||||
mode: Mode,
|
||||
) -> Result<Self, LoadingProblem<'a>> {
|
||||
pub fn from_path(arena: &'a Bump, filename: PathBuf) -> Result<Self, LoadingProblem<'a>> {
|
||||
let arc_modules = Arc::new(Mutex::new(PackageModuleIds::default()));
|
||||
let root_exposed_ident_ids = IdentIds::exposed_builtins(0);
|
||||
let ident_ids_by_module = Arc::new(Mutex::new(root_exposed_ident_ids));
|
||||
|
|
@ -1162,7 +1154,6 @@ impl<'a> LoadStart<'a> {
|
|||
Arc::clone(&arc_modules),
|
||||
Arc::clone(&ident_ids_by_module),
|
||||
root_start_time,
|
||||
mode,
|
||||
)?
|
||||
};
|
||||
|
||||
|
|
@ -1178,7 +1169,6 @@ impl<'a> LoadStart<'a> {
|
|||
arena: &'a Bump,
|
||||
filename: PathBuf,
|
||||
src: &'a str,
|
||||
mode: Mode,
|
||||
) -> Result<Self, LoadingProblem<'a>> {
|
||||
let arc_modules = Arc::new(Mutex::new(PackageModuleIds::default()));
|
||||
let root_exposed_ident_ids = IdentIds::exposed_builtins(0);
|
||||
|
|
@ -1195,7 +1185,6 @@ impl<'a> LoadStart<'a> {
|
|||
Arc::clone(&arc_modules),
|
||||
Arc::clone(&ident_ids_by_module),
|
||||
root_start_time,
|
||||
mode,
|
||||
)?
|
||||
};
|
||||
|
||||
|
|
@ -2223,7 +2212,6 @@ fn load_pkg_config<'a>(
|
|||
app_module_id: ModuleId,
|
||||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
mode: Mode,
|
||||
) -> Result<Msg<'a>, LoadingProblem<'a>> {
|
||||
let module_start_time = SystemTime::now();
|
||||
|
||||
|
|
@ -2289,7 +2277,6 @@ fn load_pkg_config<'a>(
|
|||
header.effects.effect_shortname,
|
||||
module_ids,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
header,
|
||||
effect_module_timing,
|
||||
)
|
||||
|
|
@ -2318,7 +2305,6 @@ fn load_module<'a>(
|
|||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
arc_shorthands: Arc<Mutex<MutMap<&'a str, PackageOrPath<'a>>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
mode: Mode,
|
||||
) -> Result<(ModuleId, Msg<'a>), LoadingProblem<'a>> {
|
||||
let module_start_time = SystemTime::now();
|
||||
let mut filename = PathBuf::new();
|
||||
|
|
@ -2367,7 +2353,6 @@ fn load_module<'a>(
|
|||
module_ids,
|
||||
ident_ids_by_module,
|
||||
module_start_time,
|
||||
mode,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
@ -2406,7 +2391,6 @@ fn parse_header<'a>(
|
|||
opt_shorthand: Option<&'a str>,
|
||||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
mode: Mode,
|
||||
src_bytes: &'a [u8],
|
||||
start_time: SystemTime,
|
||||
) -> Result<(ModuleId, Msg<'a>), LoadingProblem<'a>> {
|
||||
|
|
@ -2526,7 +2510,6 @@ fn parse_header<'a>(
|
|||
module_id,
|
||||
module_ids,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
)?;
|
||||
|
||||
Ok((
|
||||
|
|
@ -2565,7 +2548,6 @@ fn parse_header<'a>(
|
|||
&"",
|
||||
module_ids,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
header,
|
||||
module_timing,
|
||||
)),
|
||||
|
|
@ -2585,7 +2567,6 @@ fn load_filename<'a>(
|
|||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
module_start_time: SystemTime,
|
||||
mode: Mode,
|
||||
) -> Result<(ModuleId, Msg<'a>), LoadingProblem<'a>> {
|
||||
let file_io_start = SystemTime::now();
|
||||
let file = fs::read(&filename);
|
||||
|
|
@ -2600,7 +2581,6 @@ fn load_filename<'a>(
|
|||
opt_shorthand,
|
||||
module_ids,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
arena.alloc(bytes),
|
||||
module_start_time,
|
||||
),
|
||||
|
|
@ -2621,7 +2601,6 @@ fn load_from_str<'a>(
|
|||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
module_start_time: SystemTime,
|
||||
mode: Mode,
|
||||
) -> Result<(ModuleId, Msg<'a>), LoadingProblem<'a>> {
|
||||
let file_io_start = SystemTime::now();
|
||||
let file_io_duration = file_io_start.elapsed().unwrap();
|
||||
|
|
@ -2634,7 +2613,6 @@ fn load_from_str<'a>(
|
|||
None,
|
||||
module_ids,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
src.as_bytes(),
|
||||
module_start_time,
|
||||
)
|
||||
|
|
@ -3266,7 +3244,6 @@ fn fabricate_effects_module<'a>(
|
|||
shorthand: &'a str,
|
||||
module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
|
||||
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
|
||||
mode: Mode,
|
||||
header: PlatformHeader<'a>,
|
||||
module_timing: ModuleTiming,
|
||||
) -> (ModuleId, Msg<'a>) {
|
||||
|
|
@ -3467,7 +3444,7 @@ fn fabricate_effects_module<'a>(
|
|||
references: MutSet::default(),
|
||||
};
|
||||
|
||||
let constraint = constrain_module(&module_output, module_id, mode, &mut var_store);
|
||||
let constraint = constrain_module(&module_output, module_id);
|
||||
|
||||
let module = Module {
|
||||
module_id,
|
||||
|
|
@ -3547,7 +3524,6 @@ fn canonicalize_and_constrain<'a, F>(
|
|||
dep_idents: MutMap<ModuleId, IdentIds>,
|
||||
exposed_symbols: MutSet<Symbol>,
|
||||
aliases: MutMap<Symbol, Alias>,
|
||||
mode: Mode,
|
||||
parsed: ParsedModule<'a>,
|
||||
look_up_builtins: F,
|
||||
) -> Result<Msg<'a>, LoadingProblem<'a>>
|
||||
|
|
@ -3599,7 +3575,7 @@ where
|
|||
|
||||
match canonicalized {
|
||||
Ok(module_output) => {
|
||||
let constraint = constrain_module(&module_output, module_id, mode, &mut var_store);
|
||||
let constraint = constrain_module(&module_output, module_id);
|
||||
|
||||
let module = Module {
|
||||
module_id,
|
||||
|
|
@ -4041,7 +4017,6 @@ where
|
|||
module_ids,
|
||||
shorthands,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
} => load_module(
|
||||
arena,
|
||||
src_dir,
|
||||
|
|
@ -4049,7 +4024,6 @@ where
|
|||
module_ids,
|
||||
shorthands,
|
||||
ident_ids_by_module,
|
||||
mode,
|
||||
)
|
||||
.map(|(_, msg)| msg),
|
||||
Parse { header } => parse(arena, header),
|
||||
|
|
@ -4057,7 +4031,6 @@ where
|
|||
parsed,
|
||||
module_ids,
|
||||
dep_idents,
|
||||
mode,
|
||||
exposed_symbols,
|
||||
aliases,
|
||||
} => canonicalize_and_constrain(
|
||||
|
|
@ -4066,7 +4039,6 @@ where
|
|||
dep_idents,
|
||||
exposed_symbols,
|
||||
aliases,
|
||||
mode,
|
||||
parsed,
|
||||
look_up_builtins,
|
||||
),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue