Rename additional stale roc_module::operator refs and format

ast/src/lang/core/expr/expr2.rs

@@ -6,8 +6,8 @@ use crate::{
     mem_pool::{pool::NodeId, pool_str::PoolStr, pool_vec::PoolVec},
 };
 use roc_can::expr::Recursive;
-use roc_module::low_level::LowLevel;
 use roc_module::called_via::CalledVia;
+use roc_module::low_level::LowLevel;
 use roc_module::symbol::Symbol;
 
 use super::record_field::RecordField;

ast/src/lang/core/str.rs

@@ -1,4 +1,4 @@
-use roc_module::{operator::CalledVia, symbol::Symbol};
+use roc_module::{called_via::CalledVia, symbol::Symbol};
 use roc_parse::ast::StrLiteral;
 
 use crate::{

cli/src/repl/eval.rs

@@ -2,8 +2,8 @@ use bumpalo::collections::Vec;
 use bumpalo::Bump;
 use libloading::Library;
 use roc_gen_llvm::{run_jit_function, run_jit_function_dynamic_type};
-use roc_module::ident::TagName;
 use roc_module::called_via::CalledVia;
+use roc_module::ident::TagName;
 use roc_module::symbol::{Interns, ModuleId, Symbol};
 use roc_mono::ir::ProcLayout;
 use roc_mono::layout::{union_sorted_tags_help, Builtin, Layout, UnionLayout, UnionVariant};

compiler/can/src/builtins.rs

@@ -3,9 +3,9 @@ use crate::expr::{ClosureData, Expr::*};
 use crate::expr::{Expr, Field, Recursive, WhenBranch};
 use crate::pattern::Pattern;
 use roc_collections::all::SendMap;
+use roc_module::called_via::CalledVia;
 use roc_module::ident::{Lowercase, TagName};
 use roc_module::low_level::LowLevel;
-use roc_module::called_via::CalledVia;
 use roc_module::symbol::Symbol;
 use roc_region::all::{Located, Region};
 use roc_types::subs::{VarStore, Variable};

compiler/can/src/expr.rs

@@ -10,9 +10,9 @@ use crate::pattern::{canonicalize_pattern, Pattern};
 use crate::procedure::References;
 use crate::scope::Scope;
 use roc_collections::all::{ImSet, MutMap, MutSet, SendMap};
+use roc_module::called_via::{CalledVia, Sugar};
 use roc_module::ident::{ForeignSymbol, Lowercase, TagName};
 use roc_module::low_level::LowLevel;
-use roc_module::called_via::{CalledVia, Sugar};
 use roc_module::symbol::Symbol;
 use roc_parse::ast::{self, EscapedChar, StrLiteral};
 use roc_parse::pattern::PatternType::*;

compiler/can/src/operator.rs

@@ -2,9 +2,9 @@
 
 use bumpalo::collections::Vec;
 use bumpalo::Bump;
-use roc_module::ident::ModuleName;
 use roc_module::called_via::BinOp::Pizza;
 use roc_module::called_via::{BinOp, CalledVia};
+use roc_module::ident::ModuleName;
 use roc_parse::ast::Expr::{self, *};
 use roc_parse::ast::{AssignedField, Def, WhenBranch};
 use roc_region::all::{Located, Region};

compiler/fmt/src/expr.rs

@@ -296,10 +296,10 @@ impl<'a> Formattable<'a> for Expr<'a> {
             BinOps(lefts, right) => fmt_bin_ops(buf, lefts, right, false, parens, indent),
             UnaryOp(sub_expr, unary_op) => {
                 match &unary_op.value {
-                    operator::UnaryOp::Negate => {
+                    called_via::UnaryOp::Negate => {
                         buf.push('-');
                     }
-                    operator::UnaryOp::Not => {
+                    called_via::UnaryOp::Not => {
                         buf.push('!');
                     }
                 }
@@ -354,26 +354,26 @@ fn format_str_segment<'a>(seg: &StrSegment<'a>, buf: &mut String<'a>, indent: u1
 
 fn push_op(buf: &mut String, op: BinOp) {
     match op {
-        operator::BinOp::Caret => buf.push('^'),
+        called_via::BinOp::Caret => buf.push('^'),
-        operator::BinOp::Star => buf.push('*'),
+        called_via::BinOp::Star => buf.push('*'),
-        operator::BinOp::Slash => buf.push('/'),
+        called_via::BinOp::Slash => buf.push('/'),
-        operator::BinOp::DoubleSlash => buf.push_str("//"),
+        called_via::BinOp::DoubleSlash => buf.push_str("//"),
-        operator::BinOp::Percent => buf.push('%'),
+        called_via::BinOp::Percent => buf.push('%'),
-        operator::BinOp::DoublePercent => buf.push_str("%%"),
+        called_via::BinOp::DoublePercent => buf.push_str("%%"),
-        operator::BinOp::Plus => buf.push('+'),
+        called_via::BinOp::Plus => buf.push('+'),
-        operator::BinOp::Minus => buf.push('-'),
+        called_via::BinOp::Minus => buf.push('-'),
-        operator::BinOp::Equals => buf.push_str("=="),
+        called_via::BinOp::Equals => buf.push_str("=="),
-        operator::BinOp::NotEquals => buf.push_str("!="),
+        called_via::BinOp::NotEquals => buf.push_str("!="),
-        operator::BinOp::LessThan => buf.push('<'),
+        called_via::BinOp::LessThan => buf.push('<'),
-        operator::BinOp::GreaterThan => buf.push('>'),
+        called_via::BinOp::GreaterThan => buf.push('>'),
-        operator::BinOp::LessThanOrEq => buf.push_str("<="),
+        called_via::BinOp::LessThanOrEq => buf.push_str("<="),
-        operator::BinOp::GreaterThanOrEq => buf.push_str(">="),
+        called_via::BinOp::GreaterThanOrEq => buf.push_str(">="),
-        operator::BinOp::And => buf.push_str("&&"),
+        called_via::BinOp::And => buf.push_str("&&"),
-        operator::BinOp::Or => buf.push_str("||"),
+        called_via::BinOp::Or => buf.push_str("||"),
-        operator::BinOp::Pizza => buf.push_str("|>"),
+        called_via::BinOp::Pizza => buf.push_str("|>"),
-        operator::BinOp::Assignment => unreachable!(),
+        called_via::BinOp::Assignment => unreachable!(),
-        operator::BinOp::HasType => unreachable!(),
+        called_via::BinOp::HasType => unreachable!(),
-        operator::BinOp::Backpassing => unreachable!(),
+        called_via::BinOp::Backpassing => unreachable!(),
     }
 }
 

compiler/load/src/effect_module.rs

@@ -5,8 +5,8 @@ use roc_can::expr::{ClosureData, Expr, Recursive};
 use roc_can::pattern::Pattern;
 use roc_can::scope::Scope;
 use roc_collections::all::{MutSet, SendMap};
-use roc_module::ident::TagName;
 use roc_module::called_via::CalledVia;
+use roc_module::ident::TagName;
 use roc_module::symbol::Symbol;
 use roc_region::all::{Located, Region};
 use roc_types::subs::{VarStore, Variable};

compiler/problem/src/can.rs

@@ -1,6 +1,6 @@
 use roc_collections::all::MutSet;
-use roc_module::ident::{Ident, Lowercase, ModuleName, TagName};
 use roc_module::called_via::BinOp;
+use roc_module::ident::{Ident, Lowercase, ModuleName, TagName};
 use roc_module::symbol::{ModuleId, Symbol};
 use roc_parse::ast::Base;
 use roc_parse::pattern::PatternType;

compiler/types/src/types.rs

@@ -3,9 +3,9 @@ use crate::subs::{
     GetSubsSlice, RecordFields, Subs, UnionTags, VarStore, Variable, VariableSubsSlice,
 };
 use roc_collections::all::{ImMap, ImSet, Index, MutSet, SendMap};
+use roc_module::called_via::CalledVia;
 use roc_module::ident::{ForeignSymbol, Ident, Lowercase, TagName};
 use roc_module::low_level::LowLevel;
-use roc_module::called_via::CalledVia;
 use roc_module::symbol::{Interns, ModuleId, Symbol};
 use roc_region::all::{Located, Region};
 use std::fmt;

reporting/src/error/type.rs

@@ -1,7 +1,7 @@
 use roc_can::expected::{Expected, PExpected};
 use roc_collections::all::{Index, MutSet, SendMap};
-use roc_module::ident::{Ident, IdentStr, Lowercase, TagName};
 use roc_module::called_via::{BinOp, CalledVia, Sugar};
+use roc_module::ident::{Ident, IdentStr, Lowercase, TagName};
 use roc_module::symbol::Symbol;
 use roc_region::all::{Located, Region};
 use roc_solve::solve;