Commit 83b9fbea authored by Ian Jackson's avatar Ian Jackson
Browse files

list_builder: Use $crate namespaced imports 

I don't think we need to bother with things in the prelude,
but doing it for serde and ConfigBuildError seems nice.

Noticed while writing a test case.
parent ce877e44

crates/tor-config/src/lib.rs

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ mod path; 
pub use err::{ConfigBuildError, ReconfigureError};

pub use mut_cfg::MutCfg;

pub use path::CfgPath;

pub use serde;



pub use tor_basic_utils::macro_first_nonempty;

crates/tor-config/src/list_builder.rs

+3 −3
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ macro_rules! define_list_config_builder { 
        $( item_build: $item_build:expr; )?

    } => {

        $(#[ $docs_and_attrs ])*

        #[derive(Default, Clone, Deserialize)]

        #[derive(Default, Clone, $crate::serde::Deserialize)]

        #[serde(transparent)]

        ///

        /// This is a builder pattern struct which will be resolved
@@ -135,7 +135,7 @@ macro_rules! define_list_config_builder { 
            /// a built-in default list will be built and returned;

            /// otherwise each applicable item will be built,

            /// and the results collected into a single built list.

            pub fn build(&self) -> Result<$Built, ConfigBuildError> {

            pub fn build(&self) -> Result<$Built, $crate::ConfigBuildError> {

                let default_buffer;

                let $things = match &self.$things {

                    Some($things) => $things,
@@ -153,7 +153,7 @@ macro_rules! define_list_config_builder { 
                            [ |item| item.build() ],

                        }

                    )

                    .collect::<Result<_, ConfigBuildError>>()?;

                    .collect::<Result<_, $crate::ConfigBuildError>>()?;

                Ok($built)

            }

        }

crates/tor-guardmgr/src/fallback/set.rs

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use super::{DirStatus, FallbackDir, FallbackDirBuilder}; 
use crate::fallback::default_fallbacks;

use crate::{ids::FallbackId, PickGuardError};

use serde::Deserialize;

use tor_config::{define_list_config_builder, ConfigBuildError};

use tor_config::define_list_config_builder;



/// A list of fallback directories.

///