Skip to content

chore: fix casing on InternalError::Unexpected #3937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TomAFrench merged 1 commit into from
Jan 3, 2024
Merged

chore: fix casing on InternalError::Unexpected #3937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/noirc_evaluator/src/errors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ pub enum InternalError {
#[error("ICE: Undeclared AcirVar")]
UndeclaredAcirVar { call_stack: CallStack },
#[error("ICE: Expected {expected:?}, found {found:?}")]
UnExpected { expected: String, found: String, call_stack: CallStack },
Unexpected { expected: String, found: String, call_stack: CallStack },
}

impl RuntimeError {
Expand All @@ -119,7 +119,7 @@ impl RuntimeError {
| InternalError::MissingArg { call_stack, .. }
| InternalError::NotAConstant { call_stack, .. }
| InternalError::UndeclaredAcirVar { call_stack }
| InternalError::UnExpected { call_stack, .. },
| InternalError::Unexpected { call_stack, .. },
)
| RuntimeError::FailedConstraint { call_stack, .. }
| RuntimeError::IndexOutOfBounds { call_stack, .. }
Expand Down
20 changes: 10 additions & 10 deletions compiler/noirc_evaluator/src/ssa/acir_gen/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ impl Context {
let len = if matches!(typ, Type::Array(_, _)) {
typ.flattened_size()
} else {
return Err(InternalError::UnExpected {
return Err(InternalError::Unexpected {
expected: "Block params should be an array".to_owned(),
found: format!("Instead got {:?}", typ),
call_stack: self.acir_context.get_call_stack(),
Expand Down Expand Up @@ -640,7 +640,7 @@ impl Context {
Instruction::ArrayGet { array, index } => (array, index, None),
Instruction::ArraySet { array, index, value, .. } => (array, index, Some(value)),
_ => {
return Err(InternalError::UnExpected {
return Err(InternalError::Unexpected {
expected: "Instruction should be an ArrayGet or ArraySet".to_owned(),
found: format!("Instead got {:?}", dfg[instruction]),
call_stack: self.acir_context.get_call_stack(),
Expand Down Expand Up @@ -697,7 +697,7 @@ impl Context {

match self.convert_value(array, dfg) {
AcirValue::Var(acir_var, _) => {
return Err(RuntimeError::InternalError(InternalError::UnExpected {
return Err(RuntimeError::InternalError(InternalError::Unexpected {
expected: "an array value".to_string(),
found: format!("{acir_var:?}"),
call_stack: self.acir_context.get_call_stack(),
Expand Down Expand Up @@ -788,7 +788,7 @@ impl Context {
let slice_sizes = if store_type.contains_slice_element() {
self.compute_slice_sizes(store, None, dfg);
self.slice_sizes.get(&store).cloned().ok_or_else(|| {
InternalError::UnExpected {
InternalError::Unexpected {
expected: "Store value should have slice sizes computed".to_owned(),
found: "Missing key in slice sizes map".to_owned(),
call_stack: self.acir_context.get_call_stack(),
Expand Down Expand Up @@ -1013,7 +1013,7 @@ impl Context {
let array = match dfg[instruction] {
Instruction::ArraySet { array, .. } => array,
_ => {
return Err(InternalError::UnExpected {
return Err(InternalError::Unexpected {
expected: "Instruction should be an ArraySet".to_owned(),
found: format!("Instead got {:?}", dfg[instruction]),
call_stack: self.acir_context.get_call_stack(),
Expand Down Expand Up @@ -1235,7 +1235,7 @@ impl Context {
}
}
_ => {
return Err(InternalError::UnExpected {
return Err(InternalError::Unexpected {
expected: "AcirValue::DynamicArray or AcirValue::Array"
.to_owned(),
found: format!("{:?}", array_acir_value),
Expand All @@ -1246,7 +1246,7 @@ impl Context {
}
}
_ => {
return Err(InternalError::UnExpected {
return Err(InternalError::Unexpected {
expected: "array or instruction".to_owned(),
found: format!("{:?}", &dfg[array_id]),
call_stack: self.acir_context.get_call_stack(),
Expand All @@ -1256,7 +1256,7 @@ impl Context {
};
}
_ => {
return Err(InternalError::UnExpected {
return Err(InternalError::Unexpected {
expected: "array or slice".to_owned(),
found: array_typ.to_string(),
call_stack: self.acir_context.get_call_stack(),
Expand Down Expand Up @@ -1513,12 +1513,12 @@ impl Context {
) -> Result<AcirVar, InternalError> {
match self.convert_value(value_id, dfg) {
AcirValue::Var(acir_var, _) => Ok(acir_var),
AcirValue::Array(array) => Err(InternalError::UnExpected {
AcirValue::Array(array) => Err(InternalError::Unexpected {
expected: "a numeric value".to_string(),
found: format!("{array:?}"),
call_stack: self.acir_context.get_call_stack(),
}),
AcirValue::DynamicArray(_) => Err(InternalError::UnExpected {
AcirValue::DynamicArray(_) => Err(InternalError::Unexpected {
expected: "a numeric value".to_string(),
found: "an array".to_string(),
call_stack: self.acir_context.get_call_stack(),
Expand Down