Rename opts to opt_args in Function

cloudflare · Mar 19, 2019 · efa5146 · efa5146
1 parent b3a62b4
commit efa5146
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/engine/examples/cli.rs b/engine/examples/cli.rs
@@ -27,7 +27,7 @@ fn main() {
                     arg_kind: FunctionArgKind::Field,
                     val_type: Type::Bytes,
                 }],
-                opts: vec![],
+                opt_args: vec![],
                 return_type: Type::Bytes,
                 implementation: FunctionImpl::new(panic_function),
             },

diff --git a/engine/src/ast/field_expr.rs b/engine/src/ast/field_expr.rs
@@ -346,7 +346,7 @@ mod tests {
                             arg_kind: FunctionArgKind::Field,
                             val_type: Type::Bytes,
                         }],
-                        opts: vec![],
+                        opt_args: vec![],
                         return_type: Type::Bytes,
                         implementation: FunctionImpl::new(echo_function),
                     },
@@ -360,7 +360,7 @@ mod tests {
                             arg_kind: FunctionArgKind::Field,
                             val_type: Type::Bytes,
                         }],
-                        opts: vec![],
+                        opt_args: vec![],
                         return_type: Type::Bytes,
                         implementation: FunctionImpl::new(lowercase_function),
                     },

diff --git a/engine/src/ast/function_expr.rs b/engine/src/ast/function_expr.rs
@@ -109,7 +109,7 @@ impl<'i, 's> LexWith<'i, &'s Scheme> for FunctionCallExpr<'s> {
 
         let args_len = function.args.len();
 
-        let opts_len = function.opts.len();
+        let opts_len = function.opt_args.len();
 
         for i in 0..args_len {
             if i == 0 {
@@ -155,7 +155,7 @@ impl<'i, 's> LexWith<'i, &'s Scheme> for FunctionCallExpr<'s> {
         }
 
         for i in 0..opts_len {
-            let opt_arg = &function.opts[i];
+            let opt_arg = &function.opt_args[i];
 
             input = match take(input, 1)? {
                 (",", mut rest) => {
@@ -234,7 +234,7 @@ fn test_function() {
                             arg_kind: FunctionArgKind::Field,
                             val_type: Type::Bytes,
                         }],
-                        opts: vec![FunctionOptArg {
+                        opt_args: vec![FunctionOptArg {
                             arg_kind: FunctionArgKind::Literal,
                             value: RhsValue::Int(10),
                         }],

diff --git a/engine/src/functions.rs b/engine/src/functions.rs
@@ -67,7 +67,7 @@ pub struct Function {
     /// List of mandatory arguments.
     pub args: Vec<FunctionArg>,
     /// List of optional arguments that can be specified after manatory ones.
-    pub opts: Vec<FunctionOptArg>,
+    pub opt_args: Vec<FunctionOptArg>,
     /// Function return type.
     pub return_type: Type,
     /// Actual implementation that will be called at runtime.