Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions examples/hierarchical-env/config/default.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
cert.content = "/tmp/cert.pem"

[database]
url = "postgres://postgres@localhost"

Expand Down
9 changes: 9 additions & 0 deletions examples/hierarchical-env/settings.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@ use std::env;
use config::{Config, ConfigError, Environment, File};
use serde_derive::Deserialize;

#[derive(Debug, Deserialize)]
#[allow(unused)]
#[serde(rename_all = "lowercase")]
enum Cert {
Path(String),
Value(String),
}

#[derive(Debug, Deserialize)]
#[allow(unused)]
struct Database {
Expand Down Expand Up @@ -42,6 +50,7 @@ pub(crate) struct Settings {
sparkpost: Sparkpost,
twitter: Twitter,
braintree: Braintree,
cert: Cert,
}

impl Settings {
Expand Down
13 changes: 12 additions & 1 deletion src/de.rs
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,18 @@ impl EnumAccess {
if table.len() == 1 {
self.variant_deserializer(table.iter().next().unwrap().0)
} else {
Err(self.structural_error())
if table.is_empty() {
return Err(self.structural_error());
}
#[cfg(feature = "preserve_order")]
{
self.variant_deserializer(table.last().unwrap().0)
}

#[cfg(not(feature = "preserve_order"))]
{
Err(self.structural_error())
}
}
}

Expand Down