Skip to content

chore: bump expr-lang #3199

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
jdx merged 1 commit into from
Nov 25, 2024
Merged

chore: bump expr-lang #3199

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 Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 13 additions & 8 deletions src/aqua/aqua_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::config::SETTINGS;
use crate::duration::DAILY;
use crate::git::Git;
use crate::{dirs, file, hashmap, http};
use expr::{ExprParser, ExprProgram, ExprValue};
use expr::{ExprContext, ExprParser, ExprProgram, ExprValue};
use eyre::{eyre, ContextCompat, Result};
use indexmap::IndexSet;
use itertools::Itertools;
Expand Down Expand Up @@ -234,12 +234,12 @@ impl AquaPackage {
fn version_override(&self, v: &str) -> &AquaPackage {
let ver = versions::Versioning::new(v.strip_prefix('v').unwrap_or(v));
let mut expr = ExprParser::new();
let ctx = [("Version", v)];
expr.add_function("semver", |args| {
if args.len() != 1 {
let ctx = self.expr_ctx(v);
expr.add_function("semver", |c| {
if c.args.len() != 1 {
return Err("semver() takes exactly one argument".to_string().into());
}
let semver = args[0].as_string().unwrap().replace(' ', "");
let semver = c.args[0].as_string().unwrap().replace(' ', "");
if let Some(check_version) = versions::Requirement::new(&semver) {
if let Some(ver) = &ver {
Ok(check_version.matches(ver).into())
Expand All @@ -257,7 +257,7 @@ impl AquaPackage {
if vo.version_constraint.is_empty() {
true
} else {
expr.eval(&vo.version_constraint, ctx)
expr.eval(&vo.version_constraint, &ctx)
.map_err(|e| debug!("error parsing {}: {e}", vo.version_constraint))
.unwrap_or(false.into())
.as_bool()
Expand Down Expand Up @@ -378,9 +378,14 @@ impl AquaPackage {
}

fn expr(&self, v: &str, program: ExprProgram) -> Result<ExprValue> {
let ctx = [("Version", v)];
let expr = ExprParser::new();
expr.run(program, ctx).map_err(|e| eyre!(e))
expr.run(program, &self.expr_ctx(v)).map_err(|e| eyre!(e))
}

fn expr_ctx(&self, v: &str) -> ExprContext {
let mut ctx = ExprContext::default();
ctx.insert("Version", v);
ctx
}

pub fn version_filter_ok(&self, v: &str) -> Result<bool> {
Expand Down