valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update cargo to 2024 edition (#842)

Browse Source 
Some effects of this change:
- New formatting changes across many files. No functionality changes
should occur from that.
- Calls to `set_env` are considered unsafe, since this only happens in
tests we wrap them in `unsafe` blocks
This commit is contained in:
jcoens-openai
2025-05-07 08:37:48 -07:00
committed by GitHub
parent c577e94b67
commit 8a89d3aeda
61 changed files with 154 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codex-rs/execpolicy/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "codex-execpolicy"
version = "0.1.0"
edition = "2021"
edition = "2024"
[[bin]]
name = "codex-execpolicy"

4
codex-rs/execpolicy/src/arg_matcher.rs
View File

@@ -5,14 +5,14 @@ use crate::starlark::values::ValueLike;
use allocative::Allocative;
use derive_more::derive::Display;
use starlark::any::ProvidesStaticType;
use starlark::values::starlark_value;
use starlark::values::string::StarlarkStr;
use starlark::values::AllocValue;
use starlark::values::Heap;
use starlark::values::NoSerialize;
use starlark::values::StarlarkValue;
use starlark::values::UnpackValue;
use starlark::values::Value;
use starlark::values::starlark_value;
use starlark::values::string::StarlarkStr;
/// Patterns that lists of arguments should be compared against.
#[derive(Clone, Debug, Display, Eq, PartialEq, NoSerialize, ProvidesStaticType, Allocative)]

2
codex-rs/execpolicy/src/arg_type.rs
View File

@@ -7,8 +7,8 @@ use allocative::Allocative;
use derive_more::derive::Display;
use serde::Serialize;
use starlark::any::ProvidesStaticType;
use starlark::values::starlark_value;
use starlark::values::StarlarkValue;
use starlark::values::starlark_value;
#[derive(Debug, Clone, Display, Eq, PartialEq, ProvidesStaticType, Allocative, Serialize)]
#[display("{}", self)]

2
codex-rs/execpolicy/src/error.rs
View File

@@ -4,8 +4,8 @@ use serde::Serialize;
use crate::arg_matcher::ArgMatcher;
use crate::arg_resolver::PositionalArg;
use serde_with::serde_as;
use serde_with::DisplayFromStr;
use serde_with::serde_as;
pub type Result<T> = std::result::Result<T, Error>;

4
codex-rs/execpolicy/src/main.rs
View File

@@ -1,15 +1,15 @@
use anyhow::Result;
use clap::Parser;
use clap::Subcommand;
use codex_execpolicy::get_default_policy;
use codex_execpolicy::ExecCall;
use codex_execpolicy::MatchedExec;
use codex_execpolicy::Policy;
use codex_execpolicy::PolicyParser;
use codex_execpolicy::ValidExec;
use serde::de;
use codex_execpolicy::get_default_policy;
use serde::Deserialize;
use serde::Serialize;
use serde::de;
use std::path::PathBuf;
use std::str::FromStr;

4
codex-rs/execpolicy/src/opt.rs
View File

@@ -1,17 +1,17 @@
#![allow(clippy::needless_lifetimes)]
use crate::starlark::values::ValueLike;
use crate::ArgType;
use crate::starlark::values::ValueLike;
use allocative::Allocative;
use derive_more::derive::Display;
use starlark::any::ProvidesStaticType;
use starlark::values::starlark_value;
use starlark::values::AllocValue;
use starlark::values::Heap;
use starlark::values::NoSerialize;
use starlark::values::StarlarkValue;
use starlark::values::UnpackValue;
use starlark::values::Value;
use starlark::values::starlark_value;
/// Command line option that takes a value.
#[derive(Clone, Debug, Display, PartialEq, Eq, ProvidesStaticType, NoSerialize, Allocative)]

8
codex-rs/execpolicy/src/policy.rs
View File

@@ -2,15 +2,15 @@ use multimap::MultiMap;
use regex::Error as RegexError;
use regex::Regex;
use crate::error::Error;
use crate::error::Result;
use crate::policy_parser::ForbiddenProgramRegex;
use crate::program::PositiveExampleFailedCheck;
use crate::ExecCall;
use crate::Forbidden;
use crate::MatchedExec;
use crate::NegativeExamplePassedCheck;
use crate::ProgramSpec;
use crate::error::Error;
use crate::error::Result;
use crate::policy_parser::ForbiddenProgramRegex;
use crate::program::PositiveExampleFailedCheck;
pub struct Policy {
programs: MultiMap<String, ProgramSpec>,

6
codex-rs/execpolicy/src/policy_parser.rs
View File

@@ -1,10 +1,10 @@
#![allow(clippy::needless_lifetimes)]
use crate::arg_matcher::ArgMatcher;
use crate::opt::OptMeta;
use crate::Opt;
use crate::Policy;
use crate::ProgramSpec;
use crate::arg_matcher::ArgMatcher;
use crate::opt::OptMeta;
use log::info;
use multimap::MultiMap;
use regex::Regex;
@@ -15,9 +15,9 @@ use starlark::environment::Module;
use starlark::eval::Evaluator;
use starlark::syntax::AstModule;
use starlark::syntax::Dialect;
use starlark::values::Heap;
use starlark::values::list::UnpackList;
use starlark::values::none::NoneType;
use starlark::values::Heap;
use std::cell::RefCell;
use std::collections::HashMap;

6
codex-rs/execpolicy/src/program.rs
View File

@@ -2,9 +2,11 @@ use serde::Serialize;
use std::collections::HashMap;
use std::collections::HashSet;
use crate::ArgType;
use crate::ExecCall;
use crate::arg_matcher::ArgMatcher;
use crate::arg_resolver::resolve_observed_args_with_patterns;
use crate::arg_resolver::PositionalArg;
use crate::arg_resolver::resolve_observed_args_with_patterns;
use crate::error::Error;
use crate::error::Result;
use crate::opt::Opt;
@@ -12,8 +14,6 @@ use crate::opt::OptMeta;
use crate::valid_exec::MatchedFlag;
use crate::valid_exec::MatchedOpt;
use crate::valid_exec::ValidExec;
use crate::ArgType;
use crate::ExecCall;
#[derive(Debug)]
pub struct ProgramSpec {

2
codex-rs/execpolicy/tests/bad.rs
View File

@@ -1,5 +1,5 @@
use codex_execpolicy::get_default_policy;
use codex_execpolicy::NegativeExamplePassedCheck;
use codex_execpolicy::get_default_policy;
#[test]
fn verify_everything_in_bad_list_is_rejected() {

2
codex-rs/execpolicy/tests/cp.rs
View File

@@ -1,6 +1,5 @@
extern crate codex_execpolicy;
use codex_execpolicy::get_default_policy;
use codex_execpolicy::ArgMatcher;
use codex_execpolicy::ArgType;
use codex_execpolicy::Error;
@@ -10,6 +9,7 @@ use codex_execpolicy::MatchedExec;
use codex_execpolicy::Policy;
use codex_execpolicy::Result;
use codex_execpolicy::ValidExec;
use codex_execpolicy::get_default_policy;
fn setup() -> Policy {
get_default_policy().expect("failed to load default policy")

2
codex-rs/execpolicy/tests/good.rs
View File

@@ -1,5 +1,5 @@
use codex_execpolicy::get_default_policy;
use codex_execpolicy::PositiveExampleFailedCheck;
use codex_execpolicy::get_default_policy;
#[test]
fn verify_everything_in_good_list_is_allowed() {

2
codex-rs/execpolicy/tests/head.rs
View File

@@ -1,4 +1,3 @@
use codex_execpolicy::get_default_policy;
use codex_execpolicy::ArgMatcher;
use codex_execpolicy::ArgType;
use codex_execpolicy::Error;
@@ -9,6 +8,7 @@ use codex_execpolicy::MatchedOpt;
use codex_execpolicy::Policy;
use codex_execpolicy::Result;
use codex_execpolicy::ValidExec;
use codex_execpolicy::get_default_policy;
extern crate codex_execpolicy;

2
codex-rs/execpolicy/tests/ls.rs
View File

@@ -1,6 +1,5 @@
extern crate codex_execpolicy;
use codex_execpolicy::get_default_policy;
use codex_execpolicy::ArgType;
use codex_execpolicy::Error;
use codex_execpolicy::ExecCall;
@@ -10,6 +9,7 @@ use codex_execpolicy::MatchedFlag;
use codex_execpolicy::Policy;
use codex_execpolicy::Result;
use codex_execpolicy::ValidExec;
use codex_execpolicy::get_default_policy;
fn setup() -> Policy {
get_default_policy().expect("failed to load default policy")

2
codex-rs/execpolicy/tests/parse_sed_command.rs
View File

@@ -1,5 +1,5 @@
use codex_execpolicy::parse_sed_command;
use codex_execpolicy::Error;
use codex_execpolicy::parse_sed_command;
#[test]
fn parses_simple_print_command() {

2
codex-rs/execpolicy/tests/pwd.rs
View File

@@ -2,7 +2,6 @@ extern crate codex_execpolicy;
use std::vec;
use codex_execpolicy::get_default_policy;
use codex_execpolicy::Error;
use codex_execpolicy::ExecCall;
use codex_execpolicy::MatchedExec;
@@ -10,6 +9,7 @@ use codex_execpolicy::MatchedFlag;
use codex_execpolicy::Policy;
use codex_execpolicy::PositionalArg;
use codex_execpolicy::ValidExec;
use codex_execpolicy::get_default_policy;
fn setup() -> Policy {
get_default_policy().expect("failed to load default policy")

2
codex-rs/execpolicy/tests/sed.rs
View File

@@ -1,6 +1,5 @@
extern crate codex_execpolicy;
use codex_execpolicy::get_default_policy;
use codex_execpolicy::ArgType;
use codex_execpolicy::Error;
use codex_execpolicy::ExecCall;
@@ -11,6 +10,7 @@ use codex_execpolicy::MatchedOpt;
use codex_execpolicy::Policy;
use codex_execpolicy::Result;
use codex_execpolicy::ValidExec;
use codex_execpolicy::get_default_policy;
fn setup() -> Policy {
get_default_policy().expect("failed to load default policy")