summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLevi Bard <taktaktaktaktaktaktaktaktaktak@gmail.com>2021-09-15 23:24:57 +0200
committerGitHub <noreply@github.com>2021-09-15 17:24:57 -0400
commitb49f9033cbed8fb17179390b182ce46338f44430 (patch)
tree27ee8fc1cee786058b8040571360b617f91a9d62 /src
parentfff3c979cc3d1d8a8127f045d992aa11d0983ae1 (diff)
Remove superfluous lowercasing of feature names. (#718)
Fixes #716
Diffstat (limited to 'src')
-rw-r--r--src/options/get.rs12
-rw-r--r--src/options/set.rs6
2 files changed, 13 insertions, 5 deletions
diff --git a/src/options/get.rs b/src/options/get.rs
index 2d05f5ac..d4a593af 100644
--- a/src/options/get.rs
+++ b/src/options/get.rs
@@ -79,7 +79,7 @@ pub trait GetOptionValue {
return Some(value);
}
}
- for feature in opt.features.to_lowercase().split_whitespace().rev() {
+ for feature in opt.features.split_whitespace().rev() {
match Self::get_provenanced_value_for_feature(
option_name,
feature,
@@ -316,6 +316,9 @@ pub mod tests {
light = true
dark = true
+[delta "Uppercase-Theme"]
+ light = true
+
[delta "not-a-theme"]
max-line-distance = 0.6
"#;
@@ -331,7 +334,12 @@ pub mod tests {
assert_eq!(
themes,
- ["dark-theme", "light-and-dark-theme", "light-theme",]
+ [
+ "dark-theme",
+ "light-and-dark-theme",
+ "light-theme",
+ "Uppercase-Theme"
+ ]
);
remove_file(git_config_path).unwrap();
diff --git a/src/options/set.rs b/src/options/set.rs
index ab888517..a896820a 100644
--- a/src/options/set.rs
+++ b/src/options/set.rs
@@ -308,11 +308,11 @@ fn gather_features(
// Gather features from command line.
if let Some(git_config) = git_config {
- for feature in split_feature_string(&opt.features.to_lowercase()) {
+ for feature in split_feature_string(&opt.features) {
gather_features_recursively(feature, &mut features, builtin_features, opt, git_config);
}
} else {
- for feature in split_feature_string(&opt.features.to_lowercase()) {
+ for feature in split_feature_string(&opt.features) {
features.push_front(feature.to_string());
}
}
@@ -348,7 +348,7 @@ fn gather_features(
// Gather features from [delta] section if --features was not passed.
if opt.features.is_empty() {
if let Some(feature_string) = git_config.get::<String>("delta.features") {
- for feature in split_feature_string(&feature_string.to_lowercase()) {
+ for feature in split_feature_string(&feature_string) {
gather_features_recursively(
feature,
&mut features,