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

Make DirFilter be Debug + Send + Sync 

Abolish the handwritten Debug impl for DynFilter, which is no longer
needed.
This commit is contained in:
Ian Jackson 2022-03-25 13:01:58 +00:00
parent 123cd2223b
commit 0846ebd6d1
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/arti-client/src/builder.rs
View File

@ -113,7 +113,7 @@ impl<R: Runtime> TorClientBuilder<R> {
#[cfg(feature = "dirfilter")]
pub fn dirfilter<F>(mut self, filter: F) -> Self
where
F: tor_dirmgr::filter::DirFilter + Send + Sync + 'static,
F: tor_dirmgr::filter::DirFilter + 'static,
{
self.dirfilter = Some(tor_dirmgr::filter::DynFilter::new(filter));
self

12
crates/tor-dirmgr/src/filter.rs
View File

@ -7,6 +7,7 @@
//! future versions, or its API might change completely. There are no semver
//! guarantees.
use std::fmt::Debug;
use std::sync::Arc;
use crate::Result;
@ -16,7 +17,7 @@ use tor_netdoc::doc::{microdesc::Microdesc, netstatus::UncheckedMdConsensus};
///
/// Instances of DirFilter can be used for testing, to modify directory data
/// on-the-fly.
pub trait DirFilter {
pub trait DirFilter: Debug + Send + Sync {
/// Modify `consensus` in an unspecified way.
fn filter_consensus(&self, consensus: UncheckedMdConsensus) -> Result<UncheckedMdConsensus>;
/// Modify `md` in an unspecified way.
@ -24,7 +25,7 @@ pub trait DirFilter {
}
/// A dynamic [`DirFilter`] instance.
#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct DynFilter {
/// A reference to the DirFilter object
filter: Arc<dyn DirFilter + Send + Sync>,
@ -64,13 +65,8 @@ impl DirFilter for DynFilter {
}
}
impl std::fmt::Debug for DynFilter {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.debug_struct("DynFilter").finish_non_exhaustive()
}
}
/// A [`DirFilter`] that does nothing.
#[derive(Debug)]
struct NilFilter;
impl DirFilter for NilFilter {