mirror of
https://github.com/roc-lang/roc.git
synced 2025-09-29 14:54:47 +00:00
Resolve a bunnnch of merge conflicts
This commit is contained in:
commit
6cf755ad8d
705 changed files with 57996 additions and 28320 deletions
|
@ -1,6 +1,6 @@
|
|||
use roc_collections::all::MutSet;
|
||||
use roc_module::called_via::BinOp;
|
||||
use roc_module::ident::{Ident, Lowercase, ModuleName, TagName};
|
||||
use roc_module::operator::BinOp;
|
||||
use roc_module::symbol::{ModuleId, Symbol};
|
||||
use roc_parse::ast::Base;
|
||||
use roc_parse::pattern::PatternType;
|
||||
|
@ -139,6 +139,7 @@ pub enum RuntimeError {
|
|||
module_name: ModuleName,
|
||||
ident: Ident,
|
||||
region: Region,
|
||||
exposed_values: Vec<Lowercase>,
|
||||
},
|
||||
ModuleNotImported {
|
||||
module_name: ModuleName,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue