Skip to content

Commit ce45395

Browse files
committed
Revert "change config methods to use lowercase keys"
This reverts commit 9671e62.
1 parent 1d4c710 commit ce45395

File tree

3 files changed

+6
-10
lines changed

3 files changed

+6
-10
lines changed

src/config.rs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ impl Config {
110110
where
111111
T: Into<Value>,
112112
{
113-
self.defaults
114-
.insert(key.to_lowercase().as_str().parse()?, value.into());
113+
self.defaults.insert(key.parse()?, value.into());
115114

116115
#[allow(deprecated)]
117116
self.refresh()
@@ -130,16 +129,15 @@ impl Config {
130129
where
131130
T: Into<Value>,
132131
{
133-
self.overrides
134-
.insert(key.to_lowercase().as_str().parse()?, value.into());
132+
self.overrides.insert(key.parse()?, value.into());
135133

136134
#[allow(deprecated)]
137135
self.refresh()
138136
}
139137

140138
#[deprecated(since = "0.12.0", note = "please use 'ConfigBuilder' instead")]
141139
pub fn set_once(&mut self, key: &str, value: Value) -> Result<()> {
142-
let expr: path::Expression = key.to_lowercase().as_str().parse()?;
140+
let expr: path::Expression = key.parse()?;
143141

144142
// Traverse the cache using the path to (possibly) retrieve a value
145143
if let Some(ref mut val) = expr.get_mut(&mut self.cache) {
@@ -151,8 +149,6 @@ impl Config {
151149
}
152150

153151
fn get_value(&self, key: &str) -> Result<Value> {
154-
let k = key.to_lowercase();
155-
let key = k.as_str();
156152
// Parse the key into a path expression
157153
let expr: path::Expression = key.parse()?;
158154

tests/testsuite/case.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ fn respect_path_case() {
7474
.build()
7575
.unwrap();
7676

77-
c.get_string("Student[0].Name").unwrap_err();
77+
c.get_string("Student[0].Name").unwrap();
7878
}

tests/testsuite/set.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,6 @@ fn test_set_capital() {
116116
.unwrap();
117117

118118
assert_eq!(config.get::<bool>("this").unwrap(), false);
119-
config.get::<bool>("ThAt").unwrap_err();
120-
config.get::<usize>("logLevel").unwrap_err();
119+
assert_eq!(config.get::<bool>("ThAt").unwrap(), true);
120+
assert_eq!(config.get::<usize>("logLevel").unwrap(), 5);
121121
}

0 commit comments

Comments
 (0)