v0.5.0

Author: mdecimus

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+{
+    "rust-analyzer.showUnlinkedFileNotification": false
+}

.vscode/settings.json

@@ -1,3 +1,7 @@
+sieve-rs 0.5.0
+================================
+- Removed context.
+
 sieve-rs 0.4.0
 ================================
 - Support for expressions.

CHANGELOG

@@ -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
     }

src/compiler/mod.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,

src/lib.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);
 

src/runtime/actions/action_convert.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,

src/runtime/actions/action_editheader.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() {

src/runtime/actions/action_fileinto.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],

src/runtime/actions/action_flags.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 {