[pbs-devel] [PATCH proxmox-backup 05/10] config: remove unnecessary pub in various methods in NetworkConfig

[Lukas Wagner]

On 1/11/24 16:53, Stefan Lendl wrote:
> Signed-off-by: Stefan Lendl <s.lendl at proxmox.com>
> ---
>   pbs-config/src/network/mod.rs    | 10 +++++-----
>   pbs-config/src/network/parser.rs |  2 +-
>   2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/pbs-config/src/network/mod.rs b/pbs-config/src/network/mod.rs
> index 971c1ebe..9ecc66b8 100644
> --- a/pbs-config/src/network/mod.rs
> +++ b/pbs-config/src/network/mod.rs
> @@ -251,7 +251,7 @@ impl NetworkConfig {
>       }
>   
>       /// Check if ports are used only once
> -    pub fn check_port_usage(&self) -> Result<(), Error> {
> +    fn check_port_usage(&self) -> Result<(), Error> {
>           let mut used_ports = HashMap::new();
>           let mut check_port_usage = |iface, ports: &Vec<String>| {
>               for port in ports.iter() {
> @@ -280,7 +280,7 @@ impl NetworkConfig {
>       }
>   
>       /// Check if child mtu is less or equal than parent mtu
> -    pub fn check_mtu(&self, parent_name: &str, child_name: &str) -> Result<(), Error> {
> +    fn check_mtu(&self, parent_name: &str, child_name: &str) -> Result<(), Error> {
>           let parent = self
>               .interfaces
>               .get(parent_name)
> @@ -320,7 +320,7 @@ impl NetworkConfig {
>       }
>   
>       /// Check if bond slaves exists
> -    pub fn check_bond_slaves(&self) -> Result<(), Error> {
> +    fn check_bond_slaves(&self) -> Result<(), Error> {
>           for (iface, interface) in self.interfaces.iter() {
>               if let Some(slaves) = &interface.slaves {
>                   for slave in slaves.iter() {
> @@ -348,7 +348,7 @@ impl NetworkConfig {
>       }
>   
>       /// Check if bridge ports exists
> -    pub fn check_bridge_ports(&self) -> Result<(), Error> {
> +    fn check_bridge_ports(&self) -> Result<(), Error> {
>           lazy_static! {
>               static ref VLAN_INTERFACE_REGEX: Regex = Regex::new(r"^(\S+)\.(\d+)$").unwrap();
>           }
> @@ -372,7 +372,7 @@ impl NetworkConfig {
>           Ok(())
>       }
>   
> -    pub fn write_config(&self, w: &mut dyn Write) -> Result<(), Error> {
> +    fn write_config(&self, w: &mut dyn Write) -> Result<(), Error> { >           self.check_port_usage()?;
>           self.check_bond_slaves()?;
>           self.check_bridge_ports()?;
> diff --git a/pbs-config/src/network/parser.rs b/pbs-config/src/network/parser.rs
> index 5a83e192..0c178d9b 100644
> --- a/pbs-config/src/network/parser.rs
> +++ b/pbs-config/src/network/parser.rs
> @@ -491,7 +491,7 @@ impl<R: BufRead> NetworkParser<R> {
>               .map_err(|err| format_err!("line {}: {}", self.line_nr, err))
>       }
>   
> -    pub fn _parse_interfaces(
> +    fn _parse_interfaces(

Maybe use this opportunity to name this method in a more idiomatic way?
The _ prefix is not really common in Rust ;)

>           &mut self,
>           existing_interfaces: Option<&HashMap<String, bool>>,
>       ) -> Result<NetworkConfig, Error> {

-- 
- Lukas