Skip to content

Commit 716334a

Browse files
committed
fix
1 parent 3b3d7ed commit 716334a

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

.github/workflows/python-release.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,18 +100,20 @@ jobs:
100100
LLVM_SYS_140_PREFIX=$HOME/.pecos/llvm
101101
CIBW_BEFORE_ALL_LINUX: |
102102
curl -sSf https://sh.rustup.rs | sh -s -- -y
103+
source $HOME/.cargo/env
103104
dnf install libffi-devel -y
104105
cargo run --release -p pecos-llvm-utils --bin pecos-llvm -- install --force
105106
CIBW_REPAIR_WHEEL_COMMAND_LINUX: >
106107
auditwheel repair -w {dest_dir} {wheel} &&
107108
pipx run abi3audit --strict --report {wheel}
108109
# macOS configuration
109110
CIBW_ENVIRONMENT_MACOS: >
110-
PATH=$HOME/.pecos/llvm/bin:$PATH
111+
PATH=$HOME/.cargo/bin:$HOME/.pecos/llvm/bin:$PATH
111112
LLVM_SYS_140_PREFIX=$HOME/.pecos/llvm
112113
MACOSX_DEPLOYMENT_TARGET=13.2
113114
CIBW_BEFORE_ALL_MACOS: |
114115
curl -sSf https://sh.rustup.rs | sh -s -- -y
116+
source $HOME/.cargo/env
115117
rustup update
116118
cargo run --release -p pecos-llvm-utils --bin pecos-llvm -- install --force
117119
# Create a codesign wrapper that strips DYLD_LIBRARY_PATH to prevent

crates/pecos-phir-json/src/v0_1/expression.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@ impl<'a> ExpressionEvaluator<'a> {
183183
}
184184

185185
/// Converts an expression to a string for caching
186-
#[allow(clippy::only_used_in_recursion)]
187-
fn expr_to_cache_key(&self, expr: &Expression) -> String {
186+
fn expr_to_cache_key(expr: &Expression) -> String {
188187
match expr {
189188
Expression::Integer(val) => format!("int:{val}"),
190189
Expression::Variable(name) => format!("var:{name}"),
@@ -198,7 +197,7 @@ impl<'a> ExpressionEvaluator<'a> {
198197
}
199198
ArgItem::Integer(val) => write!(&mut key, ",int:{val}").unwrap(),
200199
ArgItem::Expression(expr) => {
201-
write!(&mut key, ",expr:{}", self.expr_to_cache_key(expr)).unwrap();
200+
write!(&mut key, ",expr:{}", Self::expr_to_cache_key(expr)).unwrap();
202201
}
203202
}
204203
}
@@ -244,7 +243,7 @@ impl<'a> ExpressionEvaluator<'a> {
244243
}
245244

246245
// For complex expressions, use caching
247-
let cache_key = self.expr_to_cache_key(expr);
246+
let cache_key = Self::expr_to_cache_key(expr);
248247
if let Some(cached_value) = self.expr_cache.get(&cache_key) {
249248
return Ok(*cached_value);
250249
}

0 commit comments

Comments
 (0)