From c9803bcfe2815a39432d578fdc5578241e05ba32 Mon Sep 17 00:00:00 2001 From: Casey Rodarmor Date: Thu, 12 Dec 2024 12:49:55 -0800 Subject: [PATCH] Sort functions alphabetically --- src/function.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/function.rs b/src/function.rs index e5e93632e7..66e7c6e2dd 100644 --- a/src/function.rs +++ b/src/function.rs @@ -263,6 +263,13 @@ fn encode_uri_component(_context: Context, s: &str) -> FunctionResult { Ok(percent_encoding::utf8_percent_encode(s, &PERCENT_ENCODE).to_string()) } +fn env(context: Context, key: &str, default: Option<&str>) -> FunctionResult { + match default { + Some(val) => env_var_or_default(context, key, val), + None => env_var(context, key), + } +} + fn env_var(context: Context, key: &str) -> FunctionResult { use std::env::VarError::*; @@ -295,13 +302,6 @@ fn env_var_or_default(context: Context, key: &str, default: &str) -> FunctionRes } } -fn env(context: Context, key: &str, default: Option<&str>) -> FunctionResult { - match default { - Some(val) => env_var_or_default(context, key, val), - None => env_var(context, key), - } -} - fn error(_context: Context, message: &str) -> FunctionResult { Err(message.to_owned()) }