vincenzopalazzo
/
arti
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tor-config: Remove unused ItemOrBool helper. 

`ItemOrBool` is currently not used anywhere (it was previously used by
the keymgr config).
This commit is contained in:
Gabriela Moldovan 2023-07-12 19:10:11 +01:00
parent d5339772f1
commit 5b97b0b2ce
No known key found for this signature in database
GPG Key ID: 3946E0ADE72BAC99
2 changed files with 1 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
crates/tor-config/semver.md Normal file
View File

@ -0,0 +1 @@
REMOVED: `ItemOrBool` (which was previously gated behind `experimental-api`)

63
crates/tor-config/src/misc.rs
View File

@ -383,33 +383,6 @@ impl TryFrom<ListenItemSerde> for ListenItem {
}
}
/// A deserializable value or bool.
#[derive(Serialize, Deserialize, Debug)]
#[allow(clippy::exhaustive_enums)] // we will add variants very rarely if ever
#[serde(untagged, bound = "T: Serialize, for<'de2> T: Deserialize<'de2>")]
#[cfg(feature = "experimental-api")]
pub enum ItemOrBool<T>
where
T: std::fmt::Debug + Serialize,
for<'de2> T: Deserialize<'de2>,
{
/// A `T` item.
Item(T),
/// A boolean value
Bool(bool),
}
#[cfg(feature = "experimental-api")]
impl<T> Default for ItemOrBool<T>
where
T: std::fmt::Debug + Serialize,
for<'de2> T: Deserialize<'de2>,
{
fn default() -> Self {
Self::Bool(true)
}
}
#[cfg(test)]
mod test {
// @@ begin test lint list maintained by maint/add_warning @@
@ -435,10 +408,6 @@ mod test {
#[serde(default)]
listen: Option<Listen>,
#[cfg(feature = "experimental-api")]
#[serde(default)]
enabled_or_string: ItemOrBool<String>,
}
#[test]
@ -587,36 +556,4 @@ mod test {
chk_err_1("need actual addr/port", "did not match any variant", "true");
chk_err("did not match any variant", r#"listen = [ [] ]"#);
}
#[test]
#[cfg(feature = "experimental-api")]
fn enabled_or_string() {
use ItemOrBool as IOB;
let chk = |iob: IOB<String>, s| {
let tc: TestConfigFile = toml::from_str(s).expect(s);
assert_eq!(
format!("{:?}", iob),
format!("{:?}", tc.enabled_or_string),
"{:?}",
s
);
};
chk(IOB::Bool(false), r#"enabled_or_string = false"#);
chk(IOB::Bool(true), r#"enabled_or_string = true"#);
chk(
IOB::Item("not a bool".into()),
r#"enabled_or_string = "not a bool""#,
);
let chk_e = |s| {
let tc: Result<TestConfigFile, _> = toml::from_str(s);
let _ = tc.expect_err(s);
};
chk_e(r#"enabled_or_string = 1"#);
chk_e(r#"enabled_or_string = []"#);
chk_e(r#"enabled_or_string = {}"#);
}
}