From a45114fe55d53e1add33128326d45c3ecf7d8d62 Mon Sep 17 00:00:00 2001 From: teoxoy <28601907+teoxoy@users.noreply.github.com> Date: Fri, 29 Sep 2023 15:56:57 +0200 Subject: [PATCH] remaining renames --- src/proc/constant_evaluator.rs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/proc/constant_evaluator.rs b/src/proc/constant_evaluator.rs index c38686e95d..e22b1275eb 100644 --- a/src/proc/constant_evaluator.rs +++ b/src/proc/constant_evaluator.rs @@ -168,8 +168,8 @@ impl<'a> ConstantEvaluator<'a> { } fn check(&self, expr: Handle) -> Result<(), ConstantEvaluatorError> { - if let Some(ref extra_data) = self.function_local_data { - if !extra_data.expression_constness.is_const(expr) { + if let Some(ref function_local_data) = self.function_local_data { + if !function_local_data.expression_constness.is_const(expr) { log::debug!("check: SubexpressionsAreNotConstant"); return Err(ConstantEvaluatorError::SubexpressionsAreNotConstant); } @@ -185,9 +185,12 @@ impl<'a> ConstantEvaluator<'a> { Expression::Constant(c) => { // Are we working in a function's expression arena, or the // module's constant expression arena? - if let Some(ref extra_data) = self.function_local_data { + if let Some(ref function_local_data) = self.function_local_data { // Deep-copy the constant's value into our arena. - self.copy_from(self.constants[c].init, extra_data.const_expressions) + self.copy_from( + self.constants[c].init, + function_local_data.const_expressions, + ) } else { // "See through" the constant and use its initializer. Ok(self.constants[c].init)