Skip to content

refactor(env): optimize and reduce allocations #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 11, 2021
Merged

refactor(env): optimize and reduce allocations #209

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 6 additions & 16 deletions src/env.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,36 +83,26 @@ impl Source for Environment {
let mut m = HashMap::new();
let uri: String = "the environment".into();

let separator = match self.separator {
Some(ref separator) => separator,
_ => "",
};

let group_separator = match self.separator {
Some(ref separator) => separator,
_ => "_",
};
let separator = self.separator.as_deref().unwrap_or("");
let group_separator = self.separator.as_deref().unwrap_or("_");

// Define a prefix pattern to test and exclude from keys
let prefix_pattern = self
.prefix
.as_ref()
.map(|prefix| format!("{}{}", prefix.clone(), group_separator));
.map(|prefix| format!("{}{}", prefix, group_separator).to_lowercase());

for (key, value) in env::vars() {
// Treat empty environment variables as unset
if self.ignore_empty && value.is_empty() {
continue;
}

let mut key = key.to_string();
let mut key = key.to_lowercase();

// Check for prefix
if let Some(ref prefix_pattern) = prefix_pattern {
if key
.to_lowercase()
.starts_with(&prefix_pattern.to_lowercase())
{
if key.starts_with(prefix_pattern) {
// Remove this prefix from the key
key = key[prefix_pattern.len()..].to_string();
} else {
Expand Down Expand Up @@ -141,7 +131,7 @@ impl Source for Environment {
ValueKind::String(value)
};

m.insert(key.to_lowercase(), Value::new(Some(&uri), value));
m.insert(key, Value::new(Some(&uri), value));
}

Ok(m)
Expand Down