v0.5.0

xtuc · Mar 28, 2024 · 45688a8 · 45688a8
1 parent 5e265aa
commit 45688a8
Show file tree

Hide file tree

Showing 36 changed files with 83 additions and 105 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.showUnlinkedFileNotification": false
+}
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+sieve-rs 0.5.0
+================================
+- Removed context.
+
 sieve-rs 0.4.0
 ================================
 - Support for expressions.

diff --git a/src/compiler/mod.rs b/src/compiler/mod.rs
@@ -330,7 +330,7 @@ impl Compiler {
         self
     }
 
-    pub fn register_functions<C>(mut self, fnc_map: &mut FunctionMap<C>) -> Self {
+    pub fn register_functions(mut self, fnc_map: &mut FunctionMap) -> Self {
         self.functions = std::mem::take(&mut fnc_map.map);
         self
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -289,6 +289,7 @@ pub struct Sieve {
     num_match_vars: usize,
 }
 
+#[derive(Clone)]
 pub struct Compiler {
     // Settings
     pub(crate) max_script_size: usize,
@@ -307,16 +308,16 @@ pub struct Compiler {
     pub(crate) functions: AHashMap<String, (u32, u32)>,
 }
 
-pub type Function<C> = for<'x> fn(&'x Context<'x, C>, Vec<Variable>) -> Variable;
+pub type Function = for<'x> fn(&'x Context<'x>, Vec<Variable>) -> Variable;
 
 #[derive(Default, Clone)]
-pub struct FunctionMap<C> {
+pub struct FunctionMap {
     pub(crate) map: AHashMap<String, (u32, u32)>,
-    pub(crate) functions: Vec<Function<C>>,
+    pub(crate) functions: Vec<Function>,
 }
 
 #[derive(Debug, Clone)]
-pub struct Runtime<C> {
+pub struct Runtime {
     pub(crate) allowed_capabilities: AHashSet<Capability>,
     pub(crate) valid_notification_uris: AHashSet<Cow<'static, str>>,
     pub(crate) valid_ext_lists: AHashSet<Cow<'static, str>>,
@@ -325,7 +326,7 @@ pub struct Runtime<C> {
     pub(crate) metadata: Vec<(Metadata<String>, Cow<'static, str>)>,
     pub(crate) include_scripts: AHashMap<String, Arc<Sieve>>,
     pub(crate) local_hostname: Cow<'static, str>,
-    pub(crate) functions: Vec<Function<C>>,
+    pub(crate) functions: Vec<Function>,
 
     pub(crate) max_nested_includes: usize,
     pub(crate) cpu_limit: usize,
@@ -341,16 +342,14 @@ pub struct Runtime<C> {
     pub(crate) vacation_use_orig_rcpt: bool,
     pub(crate) vacation_default_subject: Cow<'static, str>,
     pub(crate) vacation_subject_prefix: Cow<'static, str>,
-
-    pub(crate) context: C,
 }
 
 #[derive(Clone, Debug)]
-pub struct Context<'x, C> {
+pub struct Context<'x> {
     #[cfg(test)]
-    pub(crate) runtime: Runtime<C>,
+    pub(crate) runtime: Runtime,
     #[cfg(not(test))]
-    pub(crate) runtime: &'x Runtime<C>,
+    pub(crate) runtime: &'x Runtime,
     pub(crate) user_address: Cow<'x, str>,
     pub(crate) user_full_name: Cow<'x, str>,
     pub(crate) current_time: i64,

diff --git a/src/runtime/actions/action_convert.rs b/src/runtime/actions/action_convert.rs
@@ -38,7 +38,7 @@ enum Conversion {
 }
 
 impl Convert {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) -> TestResult {
+    pub(crate) fn exec(&self, ctx: &mut Context) -> TestResult {
         let _from_media_type = ctx.eval_value(&self.from_media_type);
         let _to_media_type = ctx.eval_value(&self.to_media_type);
 

diff --git a/src/runtime/actions/action_editheader.rs b/src/runtime/actions/action_editheader.rs
@@ -37,7 +37,7 @@ use crate::{
 };
 
 impl AddHeader {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let header_name__ = ctx.eval_value(&self.field_name);
         let header_name_ = header_name__.to_string();
         let mut header_name = String::with_capacity(header_name_.len());
@@ -68,7 +68,7 @@ impl AddHeader {
 }
 
 impl DeleteHeader {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let header_name__ = ctx.eval_value(&self.field_name);
         let header_name_ = header_name__.to_string();
         let header_name = if let Some(header_name) = HeaderName::parse(header_name_.as_ref()) {
@@ -171,7 +171,7 @@ impl RemoveCrLf for &str {
     }
 }
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     pub(crate) fn insert_header(
         &mut self,
         part_id: usize,

diff --git a/src/runtime/actions/action_fileinto.rs b/src/runtime/actions/action_fileinto.rs
@@ -24,7 +24,7 @@
 use crate::{compiler::grammar::actions::action_fileinto::FileInto, Context, Event};
 
 impl FileInto {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let folder = ctx.eval_value(&self.folder).to_string().into_owned();
         let mut events = Vec::with_capacity(2);
         if let Some(event) = ctx.build_message_id() {

diff --git a/src/runtime/actions/action_flags.rs b/src/runtime/actions/action_flags.rs
@@ -30,7 +30,7 @@ use crate::{
 };
 
 impl EditFlags {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let mut var_name_ = None;
         let var_name = self.name.as_ref().unwrap_or_else(|| {
             var_name_.get_or_insert_with(|| VariableType::Global("__flags".to_string()))
@@ -103,7 +103,7 @@ impl EditFlags {
     }
 }
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     pub(crate) fn tokenize_flags(
         &self,
         strings: &[Value],

diff --git a/src/runtime/actions/action_include.rs b/src/runtime/actions/action_include.rs
@@ -37,7 +37,7 @@ pub(crate) enum IncludeResult {
 }
 
 impl Include {
-    pub(crate) fn exec<C>(&self, ctx: &Context<C>) -> IncludeResult {
+    pub(crate) fn exec(&self, ctx: &Context) -> IncludeResult {
         let script_name = ctx.eval_value(&self.value);
         if !script_name.is_empty() {
             let script_name = if self.location == Location::Global {

diff --git a/src/runtime/actions/action_mime.rs b/src/runtime/actions/action_mime.rs
@@ -41,7 +41,7 @@ use super::action_editheader::RemoveCrLf;
 use mail_builder::headers::message_id::generate_message_id_header;
 
 impl Replace {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         // Delete children parts
         let mut part_ids = ctx.find_nested_parts_ids(false);
         part_ids.sort_unstable_by_key(|a| Reverse(*a));
@@ -182,7 +182,7 @@ impl Replace {
 }
 
 impl Enclose {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let body = ctx.eval_value(&self.value).to_string().into_owned();
         let subject = self
             .subject
@@ -341,7 +341,7 @@ impl Enclose {
 }
 
 impl ExtractText {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let mut value = String::new();
 
         if !ctx.part_iter_stack.is_empty() {
@@ -400,7 +400,7 @@ enum StackItem<'x> {
     None,
 }
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     pub(crate) fn build_message_id(&mut self) -> Option<Event> {
         if self.has_changes {
             self.last_message_id += 1;

diff --git a/src/runtime/actions/action_notify.rs b/src/runtime/actions/action_notify.rs
@@ -35,7 +35,7 @@ use crate::{
 use super::action_vacation::MAX_SUBJECT_LEN;
 
 impl Notify {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         // Do not notify on Auto-Submitted messages
         for header in &ctx.message.parts[0].headers {
             if matches!(&header.name, HeaderName::Other(name) if name.eq_ignore_ascii_case("Auto-Submitted"))

diff --git a/src/runtime/actions/action_redirect.rs b/src/runtime/actions/action_redirect.rs
@@ -29,7 +29,7 @@ use crate::{
 };
 
 impl Redirect {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         if let Some(address) = sanitize_address(ctx.eval_value(&self.address).to_string().as_ref())
         {
             if ctx.num_redirects < ctx.runtime.max_redirects

diff --git a/src/runtime/actions/action_set.rs b/src/runtime/actions/action_set.rs
@@ -32,7 +32,7 @@ use crate::{
 use std::fmt::Write;
 
 impl Set {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let mut value = ctx.eval_value(&self.value);
         for modifier in &self.modifiers {
             value = modifier.apply(value.to_string().as_ref(), ctx).into();
@@ -42,7 +42,7 @@ impl Set {
     }
 }
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     pub(crate) fn set_variable(&mut self, var_name: &VariableType, mut variable: Variable) {
         if variable.len() > self.runtime.max_variable_size {
             let mut new_variable = String::with_capacity(self.runtime.max_variable_size);
@@ -100,7 +100,7 @@ impl<'x, C> Context<'x, C> {
 }
 
 impl Modifier {
-    pub(crate) fn apply<C>(&self, input: &str, ctx: &Context<C>) -> String {
+    pub(crate) fn apply(&self, input: &str, ctx: &Context) -> String {
         let max_len = ctx.runtime.max_variable_size;
         match self {
             Modifier::Lower => input.to_lowercase(),

diff --git a/src/runtime/actions/action_vacation.rs b/src/runtime/actions/action_vacation.rs
@@ -41,7 +41,7 @@ use crate::{
 pub(crate) const MAX_SUBJECT_LEN: usize = 256;
 
 impl TestVacation {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) -> TestResult {
+    pub(crate) fn exec(&self, ctx: &mut Context) -> TestResult {
         let mut from = String::new();
         let mut user_addresses = Vec::new();
 
@@ -177,7 +177,7 @@ impl TestVacation {
 }
 
 impl Vacation {
-    pub(crate) fn exec<C>(&self, ctx: &mut Context<C>) {
+    pub(crate) fn exec(&self, ctx: &mut Context) {
         let mut vacation_to = Cow::from("");
 
         for (name, value) in &ctx.envelope {

diff --git a/src/runtime/context.rs b/src/runtime/context.rs
@@ -46,9 +46,9 @@ pub(crate) struct ScriptStack {
     pub(crate) prev_vars_match: Vec<Variable>,
 }
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     #[cfg(not(test))]
-    pub(crate) fn new(runtime: &'x Runtime<C>, message: Message<'x>) -> Self {
+    pub(crate) fn new(runtime: &'x Runtime, message: Message<'x>) -> Self {
         Context {
             #[cfg(test)]
             runtime: runtime.clone(),
@@ -657,15 +657,11 @@ impl<'x, C> Context<'x, C> {
     pub fn part(&self) -> usize {
         self.part
     }
-
-    pub fn context(&self) -> &C {
-        &self.runtime.context
-    }
 }
 
 #[cfg(test)]
-impl<'x, C: Clone> Context<'x, C> {
-    pub(crate) fn new(runtime: &'x Runtime<C>, message: Message<'x>) -> Self {
+impl<'x> Context<'x> {
+    pub(crate) fn new(runtime: &'x Runtime, message: Message<'x>) -> Self {
         Context {
             runtime: runtime.clone(),
             message,

diff --git a/src/runtime/eval.rs b/src/runtime/eval.rs
@@ -39,7 +39,7 @@ use crate::{
 
 use super::Variable;
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     pub(crate) fn variable<'y: 'x>(&'y self, var: &VariableType) -> Option<Variable> {
         match var {
             VariableType::Local(var_num) => self.vars_local.get(*var_num).cloned(),

diff --git a/src/runtime/expression.rs b/src/runtime/expression.rs
@@ -29,7 +29,7 @@ use crate::{compiler::Number, runtime::Variable, Context};
 
 use crate::compiler::grammar::expr::{BinaryOperator, Constant, Expression, UnaryOperator};
 
-impl<'x, C> Context<'x, C> {
+impl<'x> Context<'x> {
     pub(crate) fn eval_expression(&mut self, expr: &[Expression]) -> Result<Variable, Event> {
         let mut exprs = expr.iter().skip(self.expr_pos);
         while let Some(expr) = exprs.next() {