Renamed MightBeSingle to SingleOrVec

components/config/src/config/languages.rs

@@ -4,8 +4,8 @@ use errors::{bail, Result};
 use libs::unic_langid::LanguageIdentifier;
 use serde::{Deserialize, Serialize};
 
-use crate::config::might_be_single;
 use crate::config::search;
+use crate::config::single_or_vec;
 use crate::config::taxonomies;
 
 #[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
@@ -20,7 +20,7 @@ pub struct LanguageOptions {
     pub generate_feeds: bool,
     /// The filenames to use for feeds. Used to find the templates, too.
     /// Defaults to ["atom.xml"], with "rss.xml" also having a template provided out of the box.
-    #[serde(alias = "feed_filename", deserialize_with = "might_be_single")]
+    #[serde(alias = "feed_filename", deserialize_with = "single_or_vec")]
     pub feed_filenames: Vec<String>,
     pub taxonomies: Vec<taxonomies::TaxonomyConfig>,
     /// Whether to generate search index for that language, defaults to `false`

components/config/src/config/mod.rs

@@ -57,7 +57,7 @@ pub struct Config {
     pub feed_limit: Option<usize>,
     /// The filenames to use for feeds. Used to find the templates, too.
     /// Defaults to ["atom.xml"], with "rss.xml" also having a template provided out of the box.
-    #[serde(alias = "feed_filename", deserialize_with = "might_be_single")]
+    #[serde(alias = "feed_filename", deserialize_with = "single_or_vec")]
     pub feed_filenames: Vec<String>,
     /// If set, files from static/ will be hardlinked instead of copied to the output dir.
     pub hard_link_static: bool,
@@ -401,26 +401,26 @@ impl Default for Config {
 }
 
 /// Used for deserializing values that can be either a single value or a vec of values
-pub(crate) fn might_be_single<'de, T, D>(deserializer: D) -> Result<Vec<T>, D::Error>
+pub(crate) fn single_or_vec<'de, T, D>(deserializer: D) -> Result<Vec<T>, D::Error>
 where
     T: DeserializeOwned,
     D: Deserializer<'de>,
 {
-    let v = MightBeSingle::deserialize(deserializer)?;
+    let v = SingleOrVec::deserialize(deserializer)?;
     Ok(v.into())
 }
 
 #[derive(Debug, Clone, Deserialize, PartialEq, Eq)]
 #[serde(untagged)]
-pub(crate) enum MightBeSingle<T> {
+pub(crate) enum SingleOrVec<T> {
     Multiple(Vec<T>),
     One(T),
     None,
 }
 
-impl<T> From<MightBeSingle<T>> for Vec<T> {
-    fn from(x: MightBeSingle<T>) -> Vec<T> {
-        use MightBeSingle::*;
+impl<T> From<SingleOrVec<T>> for Vec<T> {
+    fn from(x: SingleOrVec<T>) -> Vec<T> {
+        use SingleOrVec::*;
 
         match x {
             Multiple(v) => v,
@@ -430,13 +430,13 @@ impl<T> From<MightBeSingle<T>> for Vec<T> {
     }
 }
 
-impl<T> From<Vec<T>> for MightBeSingle<T> {
+impl<T> From<Vec<T>> for SingleOrVec<T> {
     fn from(value: Vec<T>) -> Self {
         Self::Multiple(value)
     }
 }
 
-impl<T> Default for MightBeSingle<T> {
+impl<T> Default for SingleOrVec<T> {
     fn default() -> Self {
         Self::None
     }